diff options
| -rw-r--r-- | autoconf/configure.ac | 4 | ||||
| -rwxr-xr-x | configure | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index cf2476cde6..f57bbd56da 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -66,8 +66,8 @@ dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). dnl We need to check for the compiler up here to avoid anything else dnl starting with a different one. -AC_PROG_CC(clang llvm-gcc gcc) -AC_PROG_CXX(clang++ llvm-g++ g++) +AC_PROG_CC(clang gcc) +AC_PROG_CXX(clang++ g++) AC_PROG_CPP dnl If CXX is Clang, check that it can find and parse C++ standard library @@ -2000,7 +2000,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 clang llvm-gcc gcc + for ac_prog in clang 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 @@ -2044,7 +2044,7 @@ fi fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in clang llvm-gcc gcc + for ac_prog in clang 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 @@ -2808,7 +2808,7 @@ if test -z "$CXX"; then CXX=$CCC else if test -n "$ac_tool_prefix"; then - for ac_prog in clang++ llvm-g++ g++ + for ac_prog in clang++ 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 @@ -2852,7 +2852,7 @@ fi fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in clang++ llvm-g++ g++ + for ac_prog in clang++ 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 |