Mercurial > hg > openjdk > jdk6 > hotspot
changeset 4100:29eff71dde21
OPENJDK6-58: Allow OpenJDK to build on PaX-enabled kernels
Reviewed-by: omajid
author | andrew |
---|---|
date | Fri, 10 Jul 2015 13:59:49 +0100 |
parents | 1628564d5826 |
children | 0eaa8e875603 |
files | make/linux/makefiles/buildtree.make |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/make/linux/makefiles/buildtree.make Wed Apr 29 12:23:48 2015 -0700 +++ b/make/linux/makefiles/buildtree.make Fri Jul 10 13:59:49 2015 +0100 @@ -434,6 +434,10 @@ echo " GAMMA_PROG=gamma_g"; \ echo "fi"; \ echo ""; \ + echo "if [ -x \"$(PAX_COMMAND)\" ]; then "; \ + echo " $(PAX_COMMAND) $(PAX_COMMAND_ARGS) ./\$${GAMMA_PROG}"; \ + echo "fi"; \ + echo ""; \ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \ echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \ echo " # NOTE: gamma assumes the OpenJDK directory layout."; \