Mercurial > hg > openjdk > jdk8
changeset 923:ca4612164195
Merge
| author | lana |
|---|---|
| date | Wed, 08 Jan 2014 11:36:47 -0800 |
| parents | ff1478785e43 (current diff) 53d74b77ee53 (diff) |
| children | b5e1dad69605 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Fri Jan 03 11:54:34 2014 -0800 +++ b/common/autoconf/generated-configure.sh Wed Jan 08 11:36:47 2014 -0800 @@ -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 \
--- a/common/autoconf/toolchain.m4 Fri Jan 03 11:54:34 2014 -0800 +++ b/common/autoconf/toolchain.m4 Wed Jan 08 11:36:47 2014 -0800 @@ -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 \