aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2017-06-26 10:14:06 -0700
committerColin Cross <ccross@android.com>2017-06-26 10:17:04 -0700
commit56a7f3a94e214b6e067dbfbd135a77e301d8108a (patch)
treef49d647a0125b15d0907e944c7497f33f8b0bf60
parent2637ef07b5321a30a6bc900bfb5b527c204f2d15 (diff)
downloadjdk8u-56a7f3a94e214b6e067dbfbd135a77e301d8108a.tar.gz
Allow compiling with non-Apple clang
Allow "clang version" in the compiler version string. Change-Id: Ie6e35340321e410ecdcd22e66db7fa2c2eb78c11
-rw-r--r--common/autoconf/generated-configure.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
index 99257c8..3abd247 100644
--- a/common/autoconf/generated-configure.sh
+++ b/common/autoconf/generated-configure.sh
@@ -20389,7 +20389,7 @@ $as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\
else
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
# Check that this is likely to be GCC.
- $COMPILER --version 2>&1 | $GREP -E "Apple LLVM version|Free Software Foundation" > /dev/null
+ $COMPILER --version 2>&1 | $GREP -E "clang version|Apple LLVM version|Free Software Foundation" > /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 compiler." >&5
$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler." >&6;}
@@ -21991,7 +21991,7 @@ $as_echo "$as_me: The result from running with -V was: \"$COMPILER_VERSION_TEST\
else
COMPILER_VERSION_TEST=`$COMPILER --version 2>&1 | $HEAD -n 1`
# Check that this is likely to be GCC.
- $COMPILER --version 2>&1 | $GREP -E "Apple LLVM version|Free Software Foundation" > /dev/null
+ $COMPILER --version 2>&1 | $GREP -E "clang version|Apple LLVM version|Free Software Foundation" > /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 compiler." >&5
$as_echo "$as_me: The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required compiler." >&6;}