X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=runtime%2FMakefile;h=8d6f0ff5961dbf753bd898c89a057d63b840c794;hb=0f77fe5ea64d19a014c1ce7de77f5738d390fd9c;hp=2adc08999293f5aec1a3c25c20f24b3ac06e702a;hpb=dbf9409ef14f96c1b067c504f9358c3797441cf2;p=oota-llvm.git

diff --git a/runtime/Makefile b/runtime/Makefile
index 2adc0899929..8d6f0ff5961 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -10,15 +10,22 @@
 LEVEL = ..
 include $(LEVEL)/Makefile.config
 
-ifneq ($(wildcard $(LLVMGCCDIR)),)
-PARALLEL_DIRS  := GCCLibraries  libdummy  libprofile  libtrace GC
+ifeq ($(LLVMGCC_MAJVERS),4)
+PARALLEL_DIRS :=
+install all::
+	$(Echo) "Warning: These runtime libraries only need to be built with"
+	$(Echo) "Warning: llvm-gcc version 3. They are automatically included"
+	$(Echo) "Warning: with llvm-gcc version 4 and beyond"
+else 
+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
@@ -26,9 +33,11 @@ endif
 ifeq ($(ARCH), Sparc)
 PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS))
 endif
+endif
 
 include $(LEVEL)/Makefile.common
 
 # Install target for libraries: Copy into $LLVMGCCDIR/bytecode-libs
 #
 install::
+