make/lib/CoreLibraries.gmk

*** 245,268 ****
  
  ifeq ($(OPENJDK_TARGET_OS), aix)
    LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX
  endif # OPENJDK_TARGET_OS aix
  
  $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
      LIBRARY := jimage, \
      TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      OPTIMIZATION := LOW, \
      SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \
          $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
      EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
!     CFLAGS := $(CFLAGS_JDKLIB) \
!         $(JIMAGELIB_CPPFLAGS) \
!         -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
!         -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
!         -I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
!         -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
      CFLAGS_unix := -UDEBUG, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
--- 245,271 ----
  
  ifeq ($(OPENJDK_TARGET_OS), aix)
    LIBJIMAGE_TOOLCHAIN := TOOLCHAIN_LINK_CXX
  endif # OPENJDK_TARGET_OS aix
  
+ JIMAGELIB_CPPFLAGS := \
+     -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
+     -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+     -I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
+     -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
+     #
+ 
  $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
      LIBRARY := jimage, \
      TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      OPTIMIZATION := LOW, \
      SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \
          $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
      EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
!     CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
!     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
      CFLAGS_unix := -UDEBUG, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \