# HG changeset patch
# User erikj
# Date 1389186152 -3600
# Node ID 53d74b77ee53fb8d43f2f84bda1d135e37a09899
# Parent  347009c5881668b1e44f64d56d4a96cb20a183fa
8030781: System.setProperties(null) drops all system properties (RELEASE not set)
Reviewed-by: alanb, ihse, tbell

diff -r 347009c58816 -r 53d74b77ee53 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Dec 19 17:23:28 2013 -0800
+++ b/common/autoconf/generated-configure.sh	Wed Jan 08 14:02:32 2014 +0100
@@ -3865,7 +3865,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1384422786
+DATE_WHEN_GENERATED=1389186094
 
 ###############################################################################
 #
@@ -29625,7 +29625,7 @@
   fi
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
-  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
+  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
       -I${JDK_OUTPUTDIR}/include \
diff -r 347009c58816 -r 53d74b77ee53 common/autoconf/toolchain.m4
--- a/common/autoconf/toolchain.m4	Thu Dec 19 17:23:28 2013 -0800
+++ b/common/autoconf/toolchain.m4	Wed Jan 08 14:02:32 2014 +0100
@@ -936,7 +936,7 @@
   fi
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
-  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
+  CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"
 
   CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
       -I${JDK_OUTPUTDIR}/include \