OpenJDK / type-annotations / type-annotations
changeset 1005:690bb11e1df2
8031709: Configure --with-jvm-variants=client, server, x produces default outputdir containing comma
Reviewed-by: ihse, tbell
| author | erikj |
|---|---|
| date | Thu, 16 Jan 2014 17:16:33 +0100 |
| parents | ea7a041eb994 |
| children | 0ff0275f3388 |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 |
| diffstat | 2 files changed, 7 insertions(+), 7 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 Thu Jan 16 17:16:33 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=1389697368 +DATE_WHEN_GENERATED=1389888935 ############################################################################### # @@ -7868,7 +7868,7 @@ fi # Replace the commas with AND for use in the build directory name. - ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'` COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` if test "x$COUNT_VARIANTS" != "x,1"; then BUILDING_MULTIPLE_JVM_VARIANTS=yes @@ -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
--- a/common/autoconf/jdk-options.m4 Tue Jan 14 12:49:01 2014 -0800 +++ b/common/autoconf/jdk-options.m4 Thu Jan 16 17:16:33 2014 +0100 @@ -105,7 +105,7 @@ fi # Replace the commas with AND for use in the build directory name. - ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` + ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'` COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'` if test "x$COUNT_VARIANTS" != "x,1"; then BUILDING_MULTIPLE_JVM_VARIANTS=yes