diff options
| author | mikael <none@none> | 2014-07-10 15:52:04 -0700 |
|---|---|---|
| committer | mikael <none@none> | 2014-07-10 15:52:04 -0700 |
| commit | 296956a33df4ee2e71b721737891e76372e4333e (patch) | |
| tree | 61dca98ad67b0b2e317d9edf16cb190a59bfee30 /common | |
| parent | c5e213d582c2920b9a436326d8ac9816cb9ccd41 (diff) | |
| download | jdk8u-296956a33df4ee2e71b721737891e76372e4333e.tar.gz | |
8031709: Configure --with-jvm-variants=client, server, x produces default outputdir containing comma
Reviewed-by: tbell
Diffstat (limited to 'common')
| -rw-r--r-- | common/autoconf/generated-configure.sh | 4 | ||||
| -rw-r--r-- | common/autoconf/jdk-options.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 0da1410..4adfbfe 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3868,7 +3868,7 @@ fi #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 @@ $as_echo "$with_jvm_variants" >&6; } 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 diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 00c2003..095fa79 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -134,7 +134,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], 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 |