diff options
| author | Eric Christopher <echristo@apple.com> | 2011-09-16 20:36:25 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2011-09-16 20:36:25 +0000 |
| commit | ffee5728affd21b563c9f6b11a5029aa7fcb7bc2 (patch) | |
| tree | f826f42cd1d0378881526d04b523d6b8913d5ddc /autoconf | |
| parent | 04f138e2253d30bc754d82d40c3271d8882b4885 (diff) | |
| download | llvm-ffee5728affd21b563c9f6b11a5029aa7fcb7bc2.tar.gz llvm-ffee5728affd21b563c9f6b11a5029aa7fcb7bc2.tar.bz2 llvm-ffee5728affd21b563c9f6b11a5029aa7fcb7bc2.tar.xz | |
Move the AC_PROG_CC checks earlier in the configure file. The lateness
of the original check meant that configure was caching the default
CC check and using that instead of the result of AC_PROG_CC in both
configure checks and during compilation.
This wasn't affecting C++ so it was hard to notice.
Regenerate configure.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139937 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'autoconf')
| -rw-r--r-- | autoconf/configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 7097a4238e..2def29dffc 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -58,6 +58,12 @@ if test ${srcdir} != "." ; then fi fi +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_CPP + dnl Configure all of the projects present in our source tree. While we could dnl just AC_CONFIG_SUBDIRS on the set of directories in projects that have a dnl configure script, that usage of the AC_CONFIG_SUBDIRS macro is deprecated. @@ -965,11 +971,6 @@ dnl=== SECTION 4: Check for programs we need and that they are the right version dnl=== dnl===-----------------------------------------------------------------------=== -dnl Check for compilation tools -AC_PROG_CPP -AC_PROG_CC(clang llvm-gcc gcc) -AC_PROG_CXX(clang++ llvm-g++ g++) - AC_PROG_NM AC_SUBST(NM) |