30 ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN) |
30 ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN) |
31 else |
31 else |
32 ifeq ($(OPENJDK_TARGET_OS), windows) |
32 ifeq ($(OPENJDK_TARGET_OS), windows) |
33 DISABLE_MAPFILES := true |
33 DISABLE_MAPFILES := true |
34 endif |
34 endif |
35 ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) |
35 ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib/jli) |
36 |
36 |
37 # Applications expect to be able to link against libjawt without invoking |
37 # Applications expect to be able to link against libjawt without invoking |
38 # System.loadLibrary("jawt") first. This was the behaviour described in the |
38 # System.loadLibrary("jawt") first. This was the behaviour described in the |
39 # devloper documentation of JAWT and what worked with OpenJDK6. |
39 # devloper documentation of JAWT and what worked with OpenJDK6. |
40 ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) |
40 ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) |
41 ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)) |
41 ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,/../lib) |
42 endif |
42 endif |
43 endif |
43 endif |
44 |
44 |
45 LAUNCHER_SRC := $(JDK_TOPDIR)/src/java.base/share/native/launcher |
45 LAUNCHER_SRC := $(JDK_TOPDIR)/src/java.base/share/native/launcher |
46 LAUNCHER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/launcher \ |
46 LAUNCHER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/launcher \ |
188 CFLAGS_windows := $$($1_CFLAGS_windows), \ |
188 CFLAGS_windows := $$($1_CFLAGS_windows), \ |
189 LDFLAGS := $$(LDFLAGS_JDKEXE) \ |
189 LDFLAGS := $$(LDFLAGS_JDKEXE) \ |
190 $$(ORIGIN_ARG) \ |
190 $$(ORIGIN_ARG) \ |
191 $$($1_LDFLAGS), \ |
191 $$($1_LDFLAGS), \ |
192 LDFLAGS_linux := \ |
192 LDFLAGS_linux := \ |
193 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ |
193 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \ |
194 LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ |
194 LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ |
195 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ |
195 -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \ |
196 MAPFILE := $$($1_MAPFILE), \ |
196 MAPFILE := $$($1_MAPFILE), \ |
197 LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ |
197 LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ |
198 LIBS_unix := $$($1_LIBS_unix), \ |
198 LIBS_unix := $$($1_LIBS_unix), \ |
199 LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \ |
199 LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \ |
200 LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \ |
200 LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \ |