[llvm-commits] [llvm] r139934 - in /llvm/trunk: autoconf/configure.ac configure
Eric Christopher
echristo at apple.com
Fri Sep 16 13:36:17 PDT 2011
Author: echristo
Date: Fri Sep 16 15:36:16 2011
New Revision: 139934
URL: http://llvm.org/viewvc/llvm-project?rev=139934&view=rev
Log:
Have the llvm configure process look for clang, then llvm-gcc, and then gcc
on all platforms.
Modified:
llvm/trunk/autoconf/configure.ac
llvm/trunk/configure
Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=139934&r1=139933&r2=139934&view=diff
==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Fri Sep 16 15:36:16 2011
@@ -967,8 +967,8 @@
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)
Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=139934&r1=139933&r2=139934&view=diff
==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Fri Sep 16 15:36:16 2011
@@ -5817,7 +5817,7 @@
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
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 @@
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
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
More information about the llvm-commits
mailing list