--- a/jdk/make/lib/CoreLibraries.gmk Fri Sep 30 02:52:42 2016 -0700
+++ b/jdk/make/lib/CoreLibraries.gmk Wed Oct 05 06:28:23 2016 -0700
@@ -236,10 +236,6 @@
##########################################################################################
-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 \
@@ -249,7 +245,7 @@
$(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
LIBRARY := jimage, \
- TOOLCHAIN := $(LIBJIMAGE_TOOLCHAIN), \
+ TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
OPTIMIZATION := LOW, \
SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \