# HG changeset patch
# User andrew
# Date 1392844082 0
# Node ID 15090e20b76753aa7cc2ed8972a949972f741f64
# Parent  09c86e9065c79c7c6dbd1a0486189b60c96549e9
PR1679: Allow OpenJDK to build on PaX-enabled kernels

diff -r 09c86e9065c7 -r 15090e20b767 make/com/sun/jmx/Makefile
--- a/make/com/sun/jmx/Makefile	Thu Oct 24 17:14:18 2013 +0400
+++ b/make/com/sun/jmx/Makefile	Wed Feb 19 21:08:02 2014 +0000
@@ -114,13 +114,19 @@
 endif
 
 ifeq ($(CROSS_COMPILE_ARCH),)
-RMIC = $(RMIC_JAVA) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(RMIC_JAVA)
 else
-RMIC = $(BOOT_JAVA_CMD)  $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
+RMIC_VM = $(BOOT_JAVA_CMD)
 endif  
+RMIC = $(RMIC_VM) $(JAVA_TOOLS_FLAGS) -cp $(OUTPUTDIR)/classes sun.rmi.rmic.Main
 
 $(CLASSDESTDIR)/%_Stub.class: $(CLASSDESTDIR)/%.class
 	$(prep-target)
+	if [ -x $(PAX_COMMAND) ] ; then \
+	  if [ -w $(RMIC_VM) ] ; then \
+	    $(PAX_COMMAND) $(PAX_COMMAND_ARGS) $(RMIC_VM) ; \
+	  fi ; \
+	fi
 	$(RMIC) -classpath "$(CLASSDESTDIR)"    \
                 -d $(CLASSDESTDIR)              \
                 -v1.2                           \