View | Details | Raw Unified | Return to bug 193009 | Differences between
and this patch

Collapse All | Expand All

(-)jdk/make/lib/ServiceabilityLibraries.gmk (-3 / +2 lines)
Lines 252-266 $(eval $(call SetupNativeCompilation,BUI Link Here
252
    CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
252
    CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
253
    CFLAGS_debug := -DJPLIS_LOGGING, \
253
    CFLAGS_debug := -DJPLIS_LOGGING, \
254
    CFLAGS_release := -DNO_JPLIS_LOGGING, \
254
    CFLAGS_release := -DNO_JPLIS_LOGGING, \
255
    CFLAGS_bsd := -DLIBICONV_PLUG, \
255
    CFLAGS_bsd := -DLIBICONV_PLUG %%ICONV_CPPFLAGS%%, \
256
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
256
    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
257
    LDFLAGS := $(LDFLAGS_JDKLIB) \
257
    LDFLAGS := $(LDFLAGS_JDKLIB) \
258
        $(call SET_SHARED_LIBRARY_ORIGIN) \
258
        $(call SET_SHARED_LIBRARY_ORIGIN) \
259
        $(LIBINSTRUMENT_LDFLAGS), \
259
        $(LIBINSTRUMENT_LDFLAGS), \
260
    LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
260
    LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
261
    LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
261
    LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
262
    LDFLAGS_bsd := -Xlinker --whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
262
    LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN,/jli), \
263
        -Xlinker --no-whole-archive, \
264
    LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
263
    LDFLAGS_macosx := -Xlinker -all_load $(JDK_OUTPUTDIR)/objs/libjli_static.a \
265
        -framework Cocoa -framework Security -framework ApplicationServices, \
264
        -framework Cocoa -framework Security -framework ApplicationServices, \
266
    LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \
265
    LDFLAGS_SUFFIX := $(LIBINSTRUMENT_LDFLAGS_SUFFIX), \

Return to bug 193009