changeset 32654:23ae9cdf149e

8136690: AIX: libjimage should be linked with the C++ compiler Reviewed-by: ihse
author simonis
date Thu, 17 Sep 2015 18:04:53 +0200
parents 74f43cd059ec
children 8dfeae0ff332 dc687d3e31ab
files jdk/make/lib/CoreLibraries.gmk
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/make/lib/CoreLibraries.gmk	Wed Sep 16 10:49:11 2015 -0700
+++ b/jdk/make/lib/CoreLibraries.gmk	Thu Sep 17 18:04:53 2015 +0200
@@ -239,8 +239,13 @@
 
 ##########################################################################################
 
+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 \