mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 12:10:31 -04:00
54 lines
2.4 KiB
Text
54 lines
2.4 KiB
Text
--- jdk/make/CompileLaunchers.gmk 2014-11-25 21:13:15 UTC
|
|
+++ jdk/make/CompileLaunchers.gmk
|
|
@@ -49,7 +49,7 @@ else
|
|
ORIGIN_ROOT := /..
|
|
endif
|
|
|
|
-ifneq ($(findstring $(OPENJDK_TARGET_OS), bsd macosx), )
|
|
+ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx), )
|
|
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN)
|
|
else
|
|
ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,$(ORIGIN_ROOT)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli)
|
|
@@ -90,8 +90,6 @@ define SetupLauncher
|
|
$1_LDFLAGS := $3
|
|
$1_LDFLAGS_SUFFIX :=
|
|
ifeq ($(OPENJDK_TARGET_OS), bsd)
|
|
- $1_LDFLAGS += -Wl,--whole-archive $(JDK_OUTPUTDIR)/objs/libjli_static.a \
|
|
- -Wl,--no-whole-archive
|
|
$1_LDFLAGS_SUFFIX += -pthread
|
|
endif
|
|
|
|
@@ -177,6 +175,8 @@ define SetupLauncher
|
|
$(ORIGIN_ARG) \
|
|
$$($1_LDFLAGS), \
|
|
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_NAME,$1), \
|
|
+ LDFLAGS_bsd := -pthread \
|
|
+ $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
|
|
LDFLAGS_linux := -lpthread \
|
|
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
|
|
LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \
|
|
@@ -187,6 +187,7 @@ define SetupLauncher
|
|
LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
|
|
$(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
|
|
LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
|
|
+ LDFLAGS_SUFFIX_bsd := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lc, \
|
|
LDFLAGS_SUFFIX_solaris := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli -lthread $(LIBDL) -lc, \
|
|
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/$1_objs$(OUTPUT_SUBDIR), \
|
|
OUTPUT_DIR := $$($1_OUTPUT_DIR_ARG)$(OUTPUT_SUBDIR), \
|
|
@@ -203,7 +204,7 @@ define SetupLauncher
|
|
|
|
BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
|
|
|
|
- ifneq (,$(filter $(OPENJDK_TARGET_OS), bsd macosx aix))
|
|
+ ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
|
|
$$(BUILD_LAUNCHER_$1): $(JDK_OUTPUTDIR)/objs/libjli_static.a
|
|
endif
|
|
|
|
@@ -499,6 +500,7 @@ $(eval $(call SetupNativeCompilation,BUI
|
|
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
|
LDFLAGS_linux := -lc, \
|
|
LDFLAGS_solaris := $(UNPACKEXE_LDFLAGS_solaris) -lc, \
|
|
+ LDFLAGS_bsd := -lc, \
|
|
LDFLAGS_SUFFIX := $(LIBCXX), \
|
|
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
|
|
OUTPUT_DIR := $(JDK_OUTPUTDIR)/objs/unpackexe$(OUTPUT_SUBDIR), \
|