Have the llvm configure process look for clang, then llvm-gcc, and then gcc

on all platforms.

llvm-svn: 139934

2 files changed, 6 insertions, 6 deletions

diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index f3e94e89dfb..7097a4238e3 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -967,8 +967,8 @@ dnl===-----------------------------------------------------------------------===
 
 dnl Check for compilation tools
 AC_PROG_CPP
-AC_PROG_CC(gcc)
-AC_PROG_CXX(g++)
+AC_PROG_CC(clang llvm-gcc gcc)
+AC_PROG_CXX(clang++ llvm-g++ g++)
 
 AC_PROG_NM
 AC_SUBST(NM)
diff --git a/llvm/configure b/llvm/configure
index e049b5bd623..18b7d6da430 100755
--- a/llvm/configure
+++ b/llvm/configure
@@ -5817,7 +5817,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in gcc
+  for ac_prog in clang llvm-gcc gcc
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5861,7 +5861,7 @@ fi
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in gcc
+  for ac_prog in clang llvm-gcc gcc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -6386,7 +6386,7 @@ if test -z "$CXX"; then
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++
+  for ac_prog in clang++ llvm-g++ g++
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6430,7 +6430,7 @@ fi
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++
+  for ac_prog in clang++ llvm-g++ g++
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2