For PR722:

Change the check for llvm-gcc from using LLVMGCCDIR to LLVMGCC. This checks
for the actual tool rather than the directory in which the tool resides. In
the case of this bug, it is possible that the directory exists but that the
tools in that directory do not. This fix should avoid the makefile from
erroneously proceeding without the actual tools being available.

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

diff --git a/runtime/Makefile b/runtime/Makefile
index 9a448c3..a1c0152 100644 (file)
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -10,15 +10,15 @@
 LEVEL = ..
 include $(LEVEL)/Makefile.config
 
-ifneq ($(wildcard $(LLVMGCCDIR)),)
+ifneq ($(wildcard $(LLVMGCC)),)
 PARALLEL_DIRS  := GCCLibraries  libdummy libprofile libtrace GC
 else
 PARALLEL_DIRS  := 
 install all ::
-       @echo '********' Warning: Your LLVMGCCDIR is set incorrectly.  Double-check 
+       @echo '********' Warning: Your LLVMGCCDIR is set incorrectly.  Check 
        @echo '********' Warning: llvm/Makefile.config to make sure it matches
-       @echo '********' Warning: the directory where the C front-end is installed,
-       @echo '********' Warning: and re-run configure if it does not.
+       @echo '********' Warning: the directory where the C front-end is
+       @echo '********' Warning: installed,and re-run configure if it does not.
 endif
 
 # Disable libprofile: a faulty libtool is generated by autoconf which breaks the