60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
# User jvanek
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1548475
|
|
# java-1.8.0-openjdk: Partial build flags injection
|
|
# LFLAGS += $(EXTRA_CFLAGS) corrected to LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
--- openjdk/hotspot/make/aix/makefiles/vm.make
|
|
+++ openjdk/hotspot/make/aix/makefiles/vm.make
|
|
@@ -117,7 +117,7 @@
|
|
|
|
# Extra flags from gnumake's invocation or environment
|
|
CFLAGS += $(EXTRA_CFLAGS)
|
|
-LFLAGS += $(EXTRA_CFLAGS)
|
|
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
# Don't set excutable bit on stack segment
|
|
# the same could be done by separate execstack command
|
|
--- openjdk/hotspot/make/bsd/makefiles/vm.make
|
|
+++ openjdk/hotspot/make/bsd/makefiles/vm.make
|
|
@@ -119,7 +119,7 @@
|
|
|
|
# Extra flags from gnumake's invocation or environment
|
|
CFLAGS += $(EXTRA_CFLAGS)
|
|
-LFLAGS += $(EXTRA_CFLAGS)
|
|
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
# Don't set excutable bit on stack segment
|
|
# the same could be done by separate execstack command
|
|
--- openjdk/hotspot/make/linux/makefiles/vm.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/vm.make
|
|
@@ -122,7 +122,7 @@
|
|
|
|
# Extra flags from gnumake's invocation or environment
|
|
CFLAGS += $(EXTRA_CFLAGS)
|
|
-LFLAGS += $(EXTRA_CFLAGS)
|
|
+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
|
|
|
|
# Don't set excutable bit on stack segment
|
|
# the same could be done by separate execstack command
|
|
--- openjdk/hotspot/make/linux/makefiles/saproc.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/saproc.make
|
|
@@ -73,7 +73,7 @@
|
|
else
|
|
ALT_SAINCDIR=
|
|
endif
|
|
-SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
|
|
+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
|
SAARCH ?= $(BUILDARCH)
|
|
|
|
--- openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
|
|
@@ -44,7 +44,7 @@ LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
|
|
# cause problems with interposing. See CR: 6466665
|
|
# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
|
|
|
|
-LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
|
|
+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
|
|
|
|
# DEBUG_BINARIES overrides everything, use full -g debug information
|
|
ifeq ($(DEBUG_BINARIES), true)
|