diff options
| author | Raluca Sauciuc <ralucas@google.com> | 2019-05-11 15:55:42 -0700 |
|---|---|---|
| committer | Raluca Sauciuc <ralucas@google.com> | 2019-05-11 15:56:41 -0700 |
| commit | 7922e4adcc35226ef6e9f8ee3eccfca1b385fb3f (patch) | |
| tree | 712ea81704f740bdc632f8ca017b67e213072b21 | |
| parent | fc862411bbea0f87afaf6206452863efe6f6b341 (diff) | |
| download | jdk8u-7922e4adcc35226ef6e9f8ee3eccfca1b385fb3f.tar.gz | |
Update configuration to recognize Clang prebuilt
Regenerated by 'bash common/autoconf/autogen.sh'
Change-Id: I9e181844300c87662f1e25ff6cd531c24c05f013
| -rw-r--r-- | common/autoconf/generated-configure.sh | 6 | ||||
| -rw-r--r-- | common/autoconf/toolchain.m4 | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 672f458..bfe9a30 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4342,7 +4342,7 @@ VS_SDK_PLATFORM_NAME_2017= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1542996501 +DATE_WHEN_GENERATED=1557615197 ############################################################################### # @@ -27843,7 +27843,7 @@ $as_echo "$as_me: The result from running it was: \"$COMPILER_VERSION_OUTPUT\"" # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1` # Check that this is likely to be GCC. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Apple LLVM version\|Free Software Foundation" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Apple LLVM version\|Free Software Foundation\|clang version" > /dev/null if test $? -ne 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5 $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;} @@ -29585,7 +29585,7 @@ $as_echo "$as_me: The result from running it was: \"$COMPILER_VERSION_OUTPUT\"" # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1` # Check that this is likely to be GCC. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Apple LLVM version\|Free Software Foundation" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Apple LLVM version\|Free Software Foundation\|clang version" > /dev/null if test $? -ne 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&5 $as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler." >&6;} diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index 340efdf..aba21c8 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -422,7 +422,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1` # Check that this is likely to be GCC. - $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Apple LLVM version\|Free Software Foundation" > /dev/null + $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Apple LLVM version\|Free Software Foundation\|clang version" > /dev/null if test $? -ne 0; then AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION"]) |