Mercurial > hg > openjdk > bsd-port
changeset 1319:3b6a81ffb636 jdk7u85-b00
8133967: Fix build where PAX_COMMAND is not specified
Reviewed-by: omajid
author | andrew |
---|---|
date | Tue, 07 Jul 2015 14:16:06 +0100 |
parents | efa50fef5637 |
children | 76707a6d46af |
files | make/Defs-internal.gmk |
diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/make/Defs-internal.gmk Fri Jul 03 23:54:57 2015 +0100 +++ b/make/Defs-internal.gmk Tue Jul 07 14:16:06 2015 +0100 @@ -303,6 +303,11 @@ ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist endif +# Command to PaX mark the VM +ifndef PAX_COMMAND + PAX_COMMAND = /usr/sbin/paxmark.sh +endif + # Command arguments to PaX mark the VM ifeq ($(ARCH), i586) PAX_COMMAND_ARGS="-vmsp" @@ -329,7 +334,9 @@ JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \ PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \ PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \ - PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) + PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \ + PAX_COMMAND=$(PAX_COMMAND) \ + PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS) ifdef ARCH_DATA_MODEL COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL) @@ -355,12 +362,6 @@ COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" endif -ifdef PAX_COMMAND - COMMON_BUILD_ARGUMENTS += \ - PAX_COMMAND=$(PAX_COMMAND) \ - PAX_COMMAND_ARGS=$(PAX_COMMAND_ARGS) -endif - # When all repos support FULL_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES, # then these can be set here: #ifdef FULL_DEBUG_SYMBOLS