diff --git a/make/aix/makefiles/jsig.make b/make/aix/makefiles/jsig.make index 301aa84195b6f7a11e8e7b5f716b2ade150be053..f8bf938729c98831b91826017a99a11b724251d5 100644 --- a/make/aix/makefiles/jsig.make +++ b/make/aix/makefiles/jsig.make @@ -45,7 +45,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) LFLAGS_JSIG += $(BIN_UTILS) diff --git a/make/aix/makefiles/saproc.make b/make/aix/makefiles/saproc.make index a7f28914a3d7fce0ce248dcc9fa99f9bdbd33cef..d515ac2d8de6420886dcff123b5fdd6fff2233ae 100644 --- a/make/aix/makefiles/saproc.make +++ b/make/aix/makefiles/saproc.make @@ -66,7 +66,7 @@ endif endif -SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) +SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE) $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ diff --git a/make/aix/makefiles/vm.make b/make/aix/makefiles/vm.make index ab994a3c2ae87b37d34c6a8f2ddc0c0c048e6844..d989dab0cddbcacca002f49365a85b6f4d008d67 100644 --- a/make/aix/makefiles/vm.make +++ b/make/aix/makefiles/vm.make @@ -117,7 +117,7 @@ CFLAGS += $(CFLAGS/NOEX) # 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 diff --git a/make/bsd/makefiles/jsig.make b/make/bsd/makefiles/jsig.make index 67cb4296eb1064c728e3ea6696e7064390873ad9..29779b002e289b298570f456bd276d2857bfda92 100644 --- a/make/bsd/makefiles/jsig.make +++ b/make/bsd/makefiles/jsig.make @@ -52,7 +52,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 -pthread $(LDFLAGS_HASH_STYLE) +LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) # DEBUG_BINARIES overrides everything, use full -g debug information ifeq ($(DEBUG_BINARIES), true) diff --git a/make/bsd/makefiles/saproc.make b/make/bsd/makefiles/saproc.make index 77dc9f772d4c31fa0ec50c9a2917689aac71f754..89679100edb3eae06c34ea97dd7dc5ce4748b857 100644 --- a/make/bsd/makefiles/saproc.make +++ b/make/bsd/makefiles/saproc.make @@ -114,7 +114,7 @@ else # bring in minimum version argument or we'll fail on OSX 10.10 SA_LFLAGS = $(LFLAGS) endif -SA_LFLAGS += $(LDFLAGS_HASH_STYLE) +SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS) BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \ -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") diff --git a/make/bsd/makefiles/vm.make b/make/bsd/makefiles/vm.make index 93640d8f06826ccde51a1860491964e19328b847..60d3a204bfb37afe66805b007f0e9ebabdbcb3ad 100644 --- a/make/bsd/makefiles/vm.make +++ b/make/bsd/makefiles/vm.make @@ -119,7 +119,7 @@ CFLAGS += $(CFLAGS/NOEX) # 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 diff --git a/make/linux/makefiles/jsig.make b/make/linux/makefiles/jsig.make index 5831bbc7f9b7931fc93ec4dab4f9d26d8076a08d..be545656968b7ab78ba5b0c77cad599b0a276292 100644 --- a/make/linux/makefiles/jsig.make +++ b/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) $(LDFLAGS_NO_EXEC_STACK) +LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS) # DEBUG_BINARIES overrides everything, use full -g debug information ifeq ($(DEBUG_BINARIES), true) diff --git a/make/linux/makefiles/saproc.make b/make/linux/makefiles/saproc.make index e203eea0cfcda0f16a0ee876a998e3d35128592e..9bd8ba25988b67cdc1417906e1e0892b69b701de 100644 --- a/make/linux/makefiles/saproc.make +++ b/make/linux/makefiles/saproc.make @@ -74,7 +74,7 @@ else ALT_SAINCDIR= endif SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) \ - $(LDFLAGS_NO_EXEC_STACK) + $(LDFLAGS_NO_EXEC_STACK) $(EXTRA_LDFLAGS) SAARCH ?= $(BUILDARCH) diff --git a/make/linux/makefiles/vm.make b/make/linux/makefiles/vm.make index 1a48df939c26ceb9c7198891912ec1b35cdcf0a5..72f8d1157b70d46be1df8c79a7e18d77ccdfd1b6 100644 --- a/make/linux/makefiles/vm.make +++ b/make/linux/makefiles/vm.make @@ -122,7 +122,7 @@ CFLAGS += $(CFLAGS/NOEX) # 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