changeset 2694:752098160f94

PR1684: Build fails with empty PAX_COMMAND 2014-02-24 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1684: Build fails with empty PAX_COMMAND * Makefile.am: (ICEDTEA_ENV): Only add PAX_COMMAND when defined. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 21 Mar 2014 20:28:06 +0000
parents 358293cf091b
children 1b8baaef20dd
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 21 22:04:31 2014 +0000
+++ b/ChangeLog	Fri Mar 21 20:28:06 2014 +0000
@@ -1,3 +1,10 @@
+2014-02-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1684: Build fails with empty PAX_COMMAND
+	* Makefile.am:
+	(ICEDTEA_ENV): Only add PAX_COMMAND when defined.
+	* NEWS: Updated.
+
 2014-02-21  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* acinclude.m4:
--- a/Makefile.am	Fri Feb 21 22:04:31 2014 +0000
+++ b/Makefile.am	Fri Mar 21 20:28:06 2014 +0000
@@ -602,6 +602,11 @@
 	COMPRESS_JARS="true"
 endif
 
+if WITH_PAX
+ICEDTEA_ENV += \
+	PAX_COMMAND="${PAX_COMMAND}"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
--- a/NEWS	Fri Feb 21 22:04:31 2014 +0000
+++ b/NEWS	Fri Mar 21 20:28:06 2014 +0000
@@ -23,6 +23,7 @@
 * Bug fixes
   - Fix broken bootstrap build by updating ecj-multicatch.patch
   - PR1677: Update PaX support to detect running PaX kernel and use newer tools
+  - PR1684: Build fails with empty PAX_COMMAND
 
 New in release 2.3.13 (2014-01-14):