diff options
author | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2018-05-22 12:53:14 +0300 |
---|---|---|
committer | Alexey Ushakov <Alexey.Ushakov@jetbrains.com> | 2018-05-22 12:53:14 +0300 |
commit | 439b5cdbbc3a286d8c15aa2de154fcbda36fb0b7 (patch) | |
tree | 89104e754a20fcbd8abfa716f322d51e179d3564 | |
parent | 6d47516721bb6ee116465db66f92ccb040377e23 (diff) | |
download | jdk8u-439b5cdbbc3a286d8c15aa2de154fcbda36fb0b7.tar.gz |
JRE-773 JBRE cannot be build with Xcode 9.3jb8u152-b1402.1jb8u152-b1402jb8u152-b1397jb8u152-b1393jb8u152-b1389jb8u152-b1381jb8u152-b1380.6jb8u152-b1380.5jb8u152-b1380.4jb8u152-b1380.3jb8u152-b1380.2jb8u152-b1380.1jb8u152-b1380jb8u152-b1379jb8u152-b1375jb8u152-b1373jb8u152-b1370jb8u152-b1365jb8u152-b1363jb8u152-b1362jb8u152-b1361jb8u152-b1358jb8u152-b1352.5jb8u152-b1352.4jb8u152-b1352.3jb8u152-b1352.2jb8u152-b1352.1jb8u152-b1352jb8u152-b1351jb8u152-b1349jb8u152-b1348jb8u152-b1347jb8u152-b1346jb8u152-b1344jb8u152-b1343.5jb8u152-b1343.4jb8u152-b1343.3jb8u152-b1343.28jb8u152-b1343.27jb8u152-b1343.26jb8u152-b1343.25jb8u152-b1343.2jb8u152-b1343.18jb8u152-b1343.17jb8u152-b1343.16jb8u152-b1343.15jb8u152-b1343.14jb8u152-b1343.13jb8u152-b1343.12jb8u152-b1343.11jb8u152-b1343.10jb8u152-b1343.1jb8u152-b1343jb8u152-b1342jb8u152-b1341jb8u152-b1340jb8u152-b1339jb8u152-b1338jb8u152-b1336jb8u152-b1335jb8u152-b1333jb8u152-b1331jb8u152-b1327jb8u152-b1323jb8u152-b1322jb8u152-b1320jb8u152-b1315jb8u152-b1314jb8u152-b1299jb8u152-b1298jb8u152-b1293.3jb8u152-b1293.2jb8u152-b1293.14jb8u152-b1293.13jb8u152-b1293.12jb8u152-b1293.11jb8u152-b1293.10jb8u152-b1293.1jb8u152-b1293jb8u152-b1292jb8u152-b1291jb8u152-b1290.3jb8u152-b1290jb8u152-b1289jb8u152-b1286jb8u152-b1285jb8u152-b1284jb8u152-b1282.2jb8u152-b1282jb8u152-b1281jb8u152-b1279jb8u152-b1278jb8u152-b1276jb8u152-b1268
Removed -std=gnu++98 option for LLVM 9.X compilers
-rw-r--r-- | common/autoconf/generated-configure.sh | 10 | ||||
-rw-r--r-- | common/autoconf/toolchain.m4 | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index cc27fc7..4d8bbff 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3912,7 +3912,7 @@ fi #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1522743827 +DATE_WHEN_GENERATED=1526980950 ############################################################################### # @@ -29768,7 +29768,13 @@ fi COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ -pipe \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" - CXXSTD_CXXFLAG="-std=gnu++98" + + CC_VER_STR=`${CC} -v 2>&1 | $GREP 'version'` + CC_VER_NUM_MAJOR=`echo ${CC_VER_STR} | $GREP 'version' | $SED 's/.* version[ ]*\([0-9]*\).*/\1/'` + if test \( `echo ${CC_VER_STR} | $GREP -c 'LLVM'` -eq "0" \) -a ${CC_VER_NUM_MAJOR} -lt "9" ; then + CXXSTD_CXXFLAG="-std=gnu++98" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS\"" >&5 $as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS\"... " >&6; } diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index e8c034f..bcf9a1d 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -1021,7 +1021,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK], COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \ -pipe \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" - CXXSTD_CXXFLAG="-std=gnu++98" + + CC_VER_STR=`${CC} -v 2>&1 | $GREP 'version'` + CC_VER_NUM_MAJOR=`echo ${CC_VER_STR} | $GREP 'version' | $SED 's/.* version@<:@ @:>@*\(@<:@0-9@:>@*\).*/\1/'` + if test \( `echo ${CC_VER_STR} | $GREP -c 'LLVM'` -eq "0" \) -a ${CC_VER_NUM_MAJOR} -lt "9" ; then + CXXSTD_CXXFLAG="-std=gnu++98" + fi + TOOLCHAIN_CXX_COMPILER_CHECK_ARGUMENTS([$CXXSTD_CXXFLAG $CFLAGS_WARNINGS_ARE_ERRORS], [], [CXXSTD_CXXFLAG=""]) CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}" |