Mercurial > hg > release > icedtea7-forest-2.3 > jdk

changeset 6424:15090e20b767

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1679: Allow OpenJDK to build on PaX-enabled kernels
author andrew
date Wed, 19 Feb 2014 21:08:02 +0000
parents 09c86e9065c7
children ef183875fcc6
files make/com/sun/jmx/Makefile
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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                           \