Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8
changeset 1052:2eec717223fb
8031709: Configure --with-jvm-variants=client, server, x produces default outputdir containing comma
Reviewed-by: tbell
| author | mikael |
|---|---|
| date | Thu, 10 Jul 2014 15:52:04 -0700 |
| parents | 6247dd67fde7 |
| children | de71433b576a |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Mon Jul 07 18:02:20 2014 -0700 +++ b/common/autoconf/generated-configure.sh Thu Jul 10 15:52:04 2014 -0700 @@ -3868,7 +3868,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1397150809 +DATE_WHEN_GENERATED=1405022087 ############################################################################### # @@ -7926,7 +7926,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/' -e 's/core,/1/'` if test "x$COUNT_VARIANTS" != "x,1"; then BUILDING_MULTIPLE_JVM_VARIANTS=yes
--- a/common/autoconf/jdk-options.m4 Mon Jul 07 18:02:20 2014 -0700 +++ b/common/autoconf/jdk-options.m4 Thu Jul 10 15:52:04 2014 -0700 @@ -134,7 +134,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/' -e 's/core,/1/'` if test "x$COUNT_VARIANTS" != "x,1"; then BUILDING_MULTIPLE_JVM_VARIANTS=yes