diff options
| author | asaha <none@none> | 2014-01-21 08:12:23 -0800 |
|---|---|---|
| committer | asaha <none@none> | 2014-01-21 08:12:23 -0800 |
| commit | db80eda39be2d4bf5a2bdd5b48a13e8cbbf6c2ce (patch) | |
| tree | ac375baf0fb46391718e6200b2afc14dd4f3bfc1 /common | |
| parent | e14396517741fdf7eb73e8c09a031bfd7a401ca1 (diff) | |
| parent | b6a81ea2ac9a4578f35353c3b542db434189eecf (diff) | |
| download | jdk8u-db80eda39be2d4bf5a2bdd5b48a13e8cbbf6c2ce.tar.gz | |
Merge
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoconf/generated-configure.sh | 4 | ||||
| -rw-r--r-- | common/autoconf/toolchain.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 4ec1da9..57b86cb 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3865,7 +3865,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1387198493 +DATE_WHEN_GENERATED=1390028922 ############################################################################### # @@ -29631,7 +29631,7 @@ fi 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 --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index c7cb93f..c8b66e8 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -936,7 +936,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK], 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 \ |