mirror of
https://git.freebsd.org/ports.git
synced 2025-05-18 01:53:13 -04:00
20 lines
1.1 KiB
Text
20 lines
1.1 KiB
Text
--- 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, \
|
|
- CFLAGS_bsd := -DLIBICONV_PLUG, \
|
|
+ CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
|
|
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
|
|
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
|
$(call SET_SHARED_LIBRARY_ORIGIN) \
|
|
$(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 \
|
|
- -Xlinker --no-whole-archive, \
|
|
+ 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), \
|