Fix the "stacker doesn't build without llvm-gcc" problem. The configure

script was defaulting the LLVMGCC variable to "llvm-gcc" if it couldn't
find llvm-gcc and --with-llvmgccdir was not specified. In this case, there
is no llvm-gcc available on the system so we shouldn't assume that the
user's path will find it any better than configure could. The fix is to
default it to an empty string. If LLVMGCC is empty, the makefiles will
avoid building things that depend on llvm-gcc and give a nice warning
message to that effect.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21953 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index bdfb76dd14dac1f4cb5718ae980508a2ff9aa206..093d9f1f47d35a19cfd6b5c1e8c50adc7cd08b99 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -354,8 +354,8 @@ esac
 AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS)
 
 if test "$WITH_LLVMGCCDIR" = "default" ; then
-  AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc])
-  AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++])
+  AC_PATH_PROG(LLVMGCC, [llvm-gcc], [])
+  AC_PATH_PROG(LLVMGXX, [llvm-g++], [])
 else
   LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc
   LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++

diff --git a/configure b/configure
index bbe4105cb5f476ecea430a72b9be92b21121f404..948517019d26d5571867198839418825aaf0e0bd 100755 (executable)
--- a/configure
+++ b/configure
@@ -24648,7 +24648,6 @@ do
 done
 done
 
-  test -z "$ac_cv_path_LLVMGCC" && ac_cv_path_LLVMGCC="llvm-gcc"
   ;;
 esac
 fi
@@ -24688,7 +24687,6 @@ do
 done
 done
 
-  test -z "$ac_cv_path_LLVMGXX" && ac_cv_path_LLVMGXX="llvm-g++"
   ;;
 esac
 fi