comparison make/autoconf/hotspot.m4 @ 49707:f7fd051519ac

8201591: JVM features with "-" in name is not correctly handled Reviewed-by: erikj
author ihse
date Tue, 17 Apr 2018 15:39:20 +0200
parents 68ac1caf3d7e
children 9042ffe5b7fe
comparison
equal deleted inserted replaced
8:3971149e753b 9:60cd7bd37598
267 if test "x$with_jvm_features" != x; then 267 if test "x$with_jvm_features" != x; then
268 AC_MSG_CHECKING([user specified JVM feature list]) 268 AC_MSG_CHECKING([user specified JVM feature list])
269 USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'` 269 USER_JVM_FEATURE_LIST=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
270 AC_MSG_RESULT([$user_jvm_feature_list]) 270 AC_MSG_RESULT([$user_jvm_feature_list])
271 # These features will be added to all variant defaults 271 # These features will be added to all variant defaults
272 JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /-.*/)) print $i }'` 272 JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (!match($i, /^-.*/)) print $i }'`
273 # These features will be removed from all variant defaults 273 # These features will be removed from all variant defaults
274 DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /-.*/)) print substr($i, 2) }'` 274 DISABLED_JVM_FEATURES=`$ECHO $USER_JVM_FEATURE_LIST | $AWK '{ for (i=1; i<=NF; i++) if (match($i, /^-.*/)) print substr($i, 2) }'`
275 275
276 # Verify that the user has provided valid features 276 # Verify that the user has provided valid features
277 BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $VALID_JVM_FEATURES) 277 BASIC_GET_NON_MATCHING_VALUES(INVALID_FEATURES, $JVM_FEATURES $DISABLED_JVM_FEATURES, $VALID_JVM_FEATURES)
278 if test "x$INVALID_FEATURES" != x; then 278 if test "x$INVALID_FEATURES" != x; then
279 AC_MSG_NOTICE([Unknown JVM features specified: "$INVALID_FEATURES"]) 279 AC_MSG_NOTICE([Unknown JVM features specified: "$INVALID_FEATURES"])