# HG changeset patch
# User andrew
# Date 1392844084 0
# Node ID 3b188862d691ff2d1acd807584d724dafb2bf7c4
# Parent  24391b7e49b5230d2239a2e48f1f07c08c4fe270
PR1679: Allow OpenJDK to build on PaX-enabled kernels

diff -r 24391b7e49b5 -r 3b188862d691 make/linux/makefiles/buildtree.make
--- a/make/linux/makefiles/buildtree.make	Mon Mar 10 18:48:19 2014 +0000
+++ b/make/linux/makefiles/buildtree.make	Wed Feb 19 21:08:04 2014 +0000
@@ -435,6 +435,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."; \