1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8273072: Avoid using += in configure

Browse Source 
Reviewed-by: dholmes, jiefu
This commit is contained in:
Magnus Ihse Bursie 2021-08-27 13:53:33 +00:00
parent b92214a8d0
commit a033aa5a3d
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/autoconf/flags-cflags.m4
View File

@ -137,7 +137,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
DISABLED_WARNINGS="4800" DISABLED_WARNINGS="4800"
if test "x$TOOLCHAIN_VERSION" = x2017; then if test "x$TOOLCHAIN_VERSION" = x2017; then
# VS2017 incorrectly triggers this warning for constexpr # VS2017 incorrectly triggers this warning for constexpr
DISABLED_WARNINGS+=" 4307" DISABLED_WARNINGS="$DISABLED_WARNINGS 4307"
fi fi
;; ;;

5
make/autoconf/flags-other.m4
View File

@ -89,11 +89,12 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
# Fix linker warning. # Fix linker warning.
# Code taken from make/autoconf/flags-cflags.m4 and adapted. # Code taken from make/autoconf/flags-cflags.m4 and adapted.
JVM_BASIC_ASFLAGS+=" -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \ JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
-DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
-mmacosx-version-min=$MACOSX_VERSION_MIN" -mmacosx-version-min=$MACOSX_VERSION_MIN"
if test -n "$MACOSX_VERSION_MAX"; then if test -n "$MACOSX_VERSION_MAX"; then
JVM_BASIC_ASFLAGS+=" $OS_CFLAGS \ JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
-DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS" -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
fi fi
fi fi

4
make/autoconf/jdk-version.m4
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # 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],
MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD" MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
# If VERSION_OPT consists of only numbers and periods, add it. # If VERSION_OPT consists of only numbers and periods, add it.
if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
MACOSX_BUNDLE_BUILD_VERSION+=".$VERSION_OPT" MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
fi fi
fi fi
AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION) AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)

4
make/devkit/createMacosxDevkit.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -102,7 +102,7 @@ EXCLUDE_DIRS=" \
" "
for ex in $EXCLUDE_DIRS; do for ex in $EXCLUDE_DIRS; do
EXCLUDE_ARGS+="--exclude=$ex " EXCLUDE_ARGS="$EXCLUDE_ARGS --exclude=$ex"
done done
echo "Copying Xcode.app..." echo "Copying Xcode.app..."