diff options
| author | Dana Dahlstrom <dahlstrom@google.com> | 2018-12-11 20:00:00 -0800 |
|---|---|---|
| committer | Dana Dahlstrom <dahlstrom@google.com> | 2018-12-11 20:00:00 -0800 |
| commit | f4cdfa7543492aa1fe812d2aa3fb64b5117e6558 (patch) | |
| tree | a4cac3a32758be60e0f0f3991f923af9c5645a51 | |
| parent | c4c668ed298564d28035e940b42c7974b7086fd4 (diff) | |
| parent | 439b5cdbbc3a286d8c15aa2de154fcbda36fb0b7 (diff) | |
| download | jdk8u-f4cdfa7543492aa1fe812d2aa3fb64b5117e6558.tar.gz | |
Merge tag jb8u152-b1343.16
Change-Id: Id9ff2723155400cde1ea59d5041e23ece989b6eb
| -rw-r--r-- | common/autoconf/generated-configure.sh | 9 | ||||
| -rw-r--r-- | common/autoconf/toolchain.m4 | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 8d01e48..da596d5 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 ############################################################################### # @@ -29769,6 +29769,13 @@ fi -pipe \ -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE" + 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; } supports=yes 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}" |