OpenJDK / amber / amber
changeset 41217:c3bdba3a880a
8160630: libjimage.so and others should link statically to libgcc
Reviewed-by: ihse, tbell
| author | erikj |
|---|---|
| date | Fri, 30 Sep 2016 09:06:21 +0200 |
| parents | f8b36bb7ae5c |
| children | c22c646e063c |
| files | jdk/make/lib/CoreLibraries.gmk |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/lib/CoreLibraries.gmk Thu Sep 29 17:24:21 2016 +0000 +++ b/jdk/make/lib/CoreLibraries.gmk Fri Sep 30 09:06:21 2016 +0200 @@ -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 \