OpenJDK / type-annotations / type-annotations
changeset 1006:131a0f8deafa
8031822: Regenerate common/autoconf/generated-configure.sh after merging changes from CPU14_01
Reviewed-by: tbell
author | asaha |
---|---|
date | Wed, 15 Jan 2014 14:19:11 -0800 |
parents | ea7a041eb994 |
children | 0ff0275f3388 |
files | common/autoconf/generated-configure.sh |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Tue Jan 14 12:49:01 2014 -0800 +++ b/common/autoconf/generated-configure.sh Wed Jan 15 14:19:11 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=1389697368 +DATE_WHEN_GENERATED=1389815815 ############################################################################### # @@ -19987,8 +19987,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CC" >&5 $as_echo "no, keeping CC" >&6; } - CC="$TEST_COMPILER" - fi + fi + COMPILER=$CC COMPILER_NAME=$COMPILER_NAME @@ -21566,8 +21566,8 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, keeping CXX" >&5 $as_echo "no, keeping CXX" >&6; } - CXX="$TEST_COMPILER" - fi + fi + COMPILER=$CXX COMPILER_NAME=$COMPILER_NAME