make/common/NativeCompilation.gmk

*** 370,379 ****
--- 370,383 ----
      $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
    else ifneq (, $$($1_OPTIMIZATION))
      $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
    endif
  
+   # Add sys root specific cflags last
+   $1_EXTRA_CFLAGS += $(SYSROOT_CFLAGS)
+   $1_EXTRA_CXXFLAGS += $(SYSROOT_CFLAGS)
+ 
    # Now call add_native_source for each source file we are going to compile.
    $$(foreach p,$$($1_SRCS), \
        $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
            $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
            $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
*** 415,424 ****
--- 419,430 ----
    $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
    ifneq (,$$($1_REAL_MAPFILE))
      $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
    endif
  
+   $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
+ 
    $1 := $$($1_TARGET)
    ifneq (,$$($1_LIBRARY))
      # Generating a dynamic library.
      $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
      ifeq ($(OPENJDK_TARGET_OS), windows)