--- a/make/lib/Lib-java.instrument.gmk Fri Mar 16 16:17:17 2018 -0400
+++ b/make/lib/Lib-java.instrument.gmk Fri Mar 16 21:40:09 2018 +0100
@@ -73,17 +73,17 @@
LIBS_aix := -liconv -ljli_static $(LIBDL), \
LIBS_macosx := -liconv -framework Cocoa -framework Security \
-framework ApplicationServices \
- $(SUPPORT_OUTPUTDIR)/native/java.base/libjli_static.a, \
+ $(call FindStaticLib, java.base, jli_static), \
LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \
- $(SUPPORT_OUTPUTDIR)/native/java.base/jli_static.lib, \
+ $(call FindStaticLib, java.base, jli_static), \
))
-ifneq (, $(findstring $(OPENJDK_TARGET_OS), macosx windows aix))
- $(BUILD_LIBINSTRUMENT): $(SUPPORT_OUTPUTDIR)/native/java.base/$(LIBRARY_PREFIX)jli_static$(STATIC_LIBRARY_SUFFIX)
+ifneq ($(filter $(OPENJDK_TARGET_OS), macosx windows aix), )
+ $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static)
else
$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli, /jli)
endif
-$(BUILD_LIBINSTRUMENT): $(BUILD_LIBJAVA)
+$(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java)
TARGETS += $(BUILD_LIBINSTRUMENT)