50 endif |
50 endif |
51 |
51 |
52 ifeq ($(OPENJDK_TARGET_OS), macosx) |
52 ifeq ($(OPENJDK_TARGET_OS), macosx) |
53 ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN) |
53 ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN) |
54 else |
54 else |
55 ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) \ |
55 ORIGIN_ARG:=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) |
56 $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) |
|
57 endif |
56 endif |
58 |
57 |
59 # |
58 # |
60 # Applications expect to be able to link against libjawt without invoking |
59 # Applications expect to be able to link against libjawt without invoking |
61 # System.loadLibrary("jawt") first. This was the behaviour described in the |
60 # System.loadLibrary("jawt") first. This was the behaviour described in the |
62 # devloper documentation of JAWT and what worked with OpenJDK6. |
61 # devloper documentation of JAWT and what worked with OpenJDK6. |
63 # |
62 # |
64 ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) |
63 ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris),) |
65 ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) \ |
64 ORIGIN_ARG+=$(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)) |
66 $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)) |
|
67 endif |
65 endif |
68 |
66 |
69 define SetupLauncher |
67 define SetupLauncher |
70 # TODO: Fix mapfile on solaris. Won't work with ld as linker. |
68 # TODO: Fix mapfile on solaris. Won't work with ld as linker. |
71 # Parameter 1 is the name of the launcher (java,javac,jar...) |
69 # Parameter 1 is the name of the launcher (java,javac,jar...) |