44 CFLAGS_release := -DNO_JPLIS_LOGGING, \ |
44 CFLAGS_release := -DNO_JPLIS_LOGGING, \ |
45 EXTRA_HEADER_DIRS := java.base:libjli, \ |
45 EXTRA_HEADER_DIRS := java.base:libjli, \ |
46 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
46 LDFLAGS := $(LDFLAGS_JDKLIB) \ |
47 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
47 $(call SET_SHARED_LIBRARY_ORIGIN) \ |
48 $(LIBINSTRUMENT_LDFLAGS), \ |
48 $(LIBINSTRUMENT_LDFLAGS), \ |
49 LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ |
49 LDFLAGS_linux := -L$(call FindLibDirForModule, java.base), \ |
50 -L$(call FindLibDirForModule, java.base)/jli, \ |
50 LDFLAGS_solaris := -L$(call FindLibDirForModule, java.base), \ |
51 LDFLAGS_solaris := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ |
51 LDFLAGS_macosx := -L$(call FindLibDirForModule, java.base), \ |
52 -L$(call FindLibDirForModule, java.base)/jli, \ |
|
53 LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN,/jli) \ |
|
54 -L$(call FindLibDirForModule, java.base)/jli, \ |
|
55 LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \ |
52 LDFLAGS_aix := -L$(SUPPORT_OUTPUTDIR)/native/java.base, \ |
56 LIBS := $(JDKLIB_LIBS), \ |
53 LIBS := $(JDKLIB_LIBS), \ |
57 LIBS_unix := -ljava -ljvm $(LIBZ_LIBS), \ |
54 LIBS_unix := -ljava -ljvm $(LIBZ_LIBS), \ |
58 LIBS_linux := -ljli $(LIBDL), \ |
55 LIBS_linux := -ljli $(LIBDL), \ |
59 LIBS_solaris := -ljli $(LIBDL), \ |
56 LIBS_solaris := -ljli $(LIBDL), \ |
64 $(WINDOWS_JLI_LIB), \ |
61 $(WINDOWS_JLI_LIB), \ |
65 )) |
62 )) |
66 |
63 |
67 ifeq ($(OPENJDK_TARGET_OS), aix) |
64 ifeq ($(OPENJDK_TARGET_OS), aix) |
68 $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static) |
65 $(BUILD_LIBINSTRUMENT): $(call FindStaticLib, java.base, jli_static) |
69 else ifeq ($(OPENJDK_TARGET_OS), windows) |
66 else |
70 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli) |
67 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli) |
71 else |
|
72 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, jli, /jli) |
|
73 endif |
68 endif |
74 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java) |
69 $(BUILD_LIBINSTRUMENT): $(call FindLib, java.base, java) |
75 |
70 |
76 TARGETS += $(BUILD_LIBINSTRUMENT) |
71 TARGETS += $(BUILD_LIBINSTRUMENT) |
77 |
72 |