diff options
Diffstat (limited to 'java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk index 08e8d283b575..0b836f2cef82 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk @@ -1,6 +1,6 @@ --- jdk/make/lib/CoreLibraries.gmk +++ jdk/make/lib/CoreLibraries.gmk -@@ -513,11 +513,12 @@ +@@ -496,10 +496,11 @@ CFLAGS := $(CFLAGS_JDKLIB) \ -I$(JDK_TOPDIR)/src/share/npt \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \ @@ -8,9 +8,8 @@ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ - LDFLAGS_macosx := -liconv, \ - LDFLAGS_bsd := -liconv, \ + LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \ + LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ LDFLAGS_SUFFIX_solaris := -lc, \ - VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |