diff options
| author | Colin Cross <ccross@android.com> | 2017-06-27 18:20:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-27 18:20:12 +0000 |
| commit | 11a0b4b3746828347a08fdfad38ee54cfdf73c3f (patch) | |
| tree | 8b5c868bf9f9ccffc5620d1d2a623ecd85764dd8 | |
| parent | 29ff809883e645f92a91efd79b0270bf02c9d06c (diff) | |
| parent | f626a6b4854cea8b260ee443c43f6d1bdad2e4f0 (diff) | |
| download | jdk8u-11a0b4b3746828347a08fdfad38ee54cfdf73c3f.tar.gz | |
Merge "Allow compiling with non-Apple clang" into studio-master-dev
am: f626a6b485
Change-Id: I077a2e819702c71808dec532388be0f26034095e
| -rw-r--r-- | common/autoconf/generated-configure.sh | 4 |
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;} |