mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-11 15:31:48 +02:00
22 lines
1.0 KiB
Diff
22 lines
1.0 KiB
Diff
our LDFLAGS has -Wl,-z,relro but the commas are expanded too early in makefile.
|
|
|
|
--- ./jdk/make/CompileDemos.gmk.orig
|
|
+++ ./jdk/make/CompileDemos.gmk
|
|
@@ -245,13 +245,15 @@
|
|
BUILD_DEMO_JVMTI_$1_CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_DEBUG_SYMBOLS) \
|
|
-I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
|
|
|
|
+ BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref,$(LDFLAGS_JDKLIB))
|
|
+
|
|
# Remove the -incremental:no setting to get .ilk-files like in the old build.
|
|
$$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
|
|
SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
|
|
LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
|
|
OPTIMIZATION := LOW, \
|
|
CXXFLAGS := $$($1_CXXFLAGS), \
|
|
- LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
|
|
+ LDFLAGS := $$(BUILD_DEMO_JVMTI_$1_LDFLAGS), \
|
|
LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
|
|
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
|
|
LDFLAGS_SUFFIX_posix := $5, \
|