diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2015-02-15 21:18:12 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2015-02-15 21:18:12 +0000 |
| commit | 2c4da2b583b566cb1836212f64e60edb0a9b12f1 (patch) | |
| tree | 0ca9856306183ab0346a843901d373f4b6720472 /java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | |
| parent | Update to 1.12.2 (diff) | |
. Fix the DEBUG build.
PR: 193009
Submitted by: Brian Gardner (openjdk@getsnappy.com)
Notes
Notes:
svn path=/head/; revision=379049
Diffstat (limited to '')
| -rw-r--r-- | java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk index 152e2943e8c5..49abeced3eda 100644 --- a/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk +++ b/java/openjdk8/files/patch-jdk-make-lib-ServiceabilityLibraries.gmk @@ -1,6 +1,6 @@ ---- jdk/make/lib/ServiceabilityLibraries.gmk.orig 2014-11-08 19:59:40.000000000 -0800 -+++ jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-08 20:00:50.000000000 -0800 -@@ -252,7 +252,7 @@ +--- jdk/make/lib/ServiceabilityLibraries.gmk 2014-11-25 21:11:53 UTC ++++ jdk/make/lib/ServiceabilityLibraries.gmk +@@ -252,15 +252,14 @@ $(eval $(call SetupNativeCompilation,BUI CFLAGS := $(LIBINSTRUMENT_CFLAGS), \ CFLAGS_debug := -DJPLIS_LOGGING, \ CFLAGS_release := -DNO_JPLIS_LOGGING, \ @@ -9,12 +9,12 @@ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN) \ -@@ -260,7 +260,7 @@ + $(LIBINSTRUMENT_LDFLAGS), \ LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ - LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \ +- LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \ - -Xlinker --no-whole-archive, \ -+ -Xlinker --no-whole-archive %%ICONV_LDFLAGS%% $(LIBZ), \ ++ LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \ LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \ -framework Cocoa -framework Security -framework ApplicationServices, \ LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \ |