Skip to content

Commit a033aa5

Browse files
committedAug 27, 2021
8273072: Avoid using += in configure
Reviewed-by: dholmes, jiefu
1 parent b92214a commit a033aa5

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed
 

‎make/autoconf/flags-cflags.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
137137
DISABLED_WARNINGS="4800"
138138
if test "x$TOOLCHAIN_VERSION" = x2017; then
139139
# VS2017 incorrectly triggers this warning for constexpr
140-
DISABLED_WARNINGS+=" 4307"
140+
DISABLED_WARNINGS="$DISABLED_WARNINGS 4307"
141141
fi
142142
;;
143143

‎make/autoconf/flags-other.m4

+3-2
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,12 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
8989
9090
# Fix linker warning.
9191
# Code taken from make/autoconf/flags-cflags.m4 and adapted.
92-
JVM_BASIC_ASFLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
92+
JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
93+
-DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
9394
-mmacosx-version-min=$MACOSX_VERSION_MIN"
9495
9596
if test -n "$MACOSX_VERSION_MAX"; then
96-
JVM_BASIC_ASFLAGS+=" $OS_CFLAGS \
97+
JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
9798
-DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
9899
fi
99100
fi

‎make/autoconf/jdk-version.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -525,7 +525,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
525525
MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
526526
# If VERSION_OPT consists of only numbers and periods, add it.
527527
if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
528-
MACOSX_BUNDLE_BUILD_VERSION+=".$VERSION_OPT"
528+
MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
529529
fi
530530
fi
531531
AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)

‎make/devkit/createMacosxDevkit.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -102,7 +102,7 @@ EXCLUDE_DIRS=" \
102102
"
103103

104104
for ex in $EXCLUDE_DIRS; do
105-
EXCLUDE_ARGS+="--exclude=$ex "
105+
EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=$ex"
106106
done
107107

108108
echo "Copying Xcode.app..."

0 commit comments

Comments
 (0)
Please sign in to comment.