equal
deleted
inserted
replaced
28 # Hook to include the corresponding custom file, if present. |
28 # Hook to include the corresponding custom file, if present. |
29 $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk)) |
29 $(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk)) |
30 |
30 |
31 ################################################################################ |
31 ################################################################################ |
32 |
32 |
33 ifeq ($(OPENJDK_TARGET_OS), windows) |
33 ifeq ($(call isTargetOs, windows), true) |
34 # equivalent of strcasecmp is stricmp on Windows |
34 # equivalent of strcasecmp is stricmp on Windows |
35 LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp |
35 LIBINSTRUMENT_CFLAGS := -Dstrcasecmp=stricmp |
36 WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib |
36 WINDOWS_JLI_LIB := $(SUPPORT_OUTPUTDIR)/native/java.base/libjli/jli.lib |
37 endif |
37 endif |
38 |
38 |
60 -framework ApplicationServices, \ |
60 -framework ApplicationServices, \ |
61 LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ |
61 LIBS_windows := jvm.lib $(WIN_JAVA_LIB) advapi32.lib \ |
62 $(WINDOWS_JLI_LIB), \ |
62 $(WINDOWS_JLI_LIB), \ |
63 )) |
63 )) |
64 |
64 |
65 ifeq ($(OPENJDK_TARGET_OS), aix) |
65 ifeq ($(call isTargetOs, aix), true) |
66 $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static) |
66 $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static) |
67 else |
67 else |
68 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli) |
68 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli) |
69 endif |
69 endif |
70 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java) |
70 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java) |