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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk index 7c55ac72243a..5ff9fc8d7df3 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-CoreLibraries.gmk @@ -1,15 +1,15 @@ ---- jdk/make/lib/CoreLibraries.gmk.orig 2014-11-08 19:58:00.000000000 -0800 -+++ jdk/make/lib/CoreLibraries.gmk 2014-11-08 19:58:38.000000000 -0800 -@@ -516,11 +516,11 @@ +--- jdk/make/lib/CoreLibraries.gmk.orig 2015-07-18 14:40:01.000000000 -0700 ++++ jdk/make/lib/CoreLibraries.gmk 2015-07-18 14:40:47.000000000 -0700 +@@ -523,11 +523,11 @@ CFLAGS := $(CFLAGS_JDKLIB) \ -I$(JDK_TOPDIR)/src/share/npt \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/npt, \ -- CFLAGS_bsd := -DLIBICONV_PLUG, \ +- CFLAGS_bsd := $(BSD_ICONV_CFLAGS), \ + CFLAGS_bsd := %%ICONV_CPPFLAGS%%, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnpt/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ -- LDFLAGS_bsd := -liconv, \ +- LDFLAGS_bsd := -L$(PACKAGE_PATH)/lib -liconv, \ + LDFLAGS_bsd := %%ICONV_LDFLAGS%%, \ LDFLAGS_macosx := -liconv, \ LDFLAGS_SUFFIX_windows := -export:nptInitialize -export:nptTerminate, \ |