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

diff --git a/runtime/Makefile b/runtime/Makefile
index 3bcda6d03ca..8d6f0ff5961 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -1,4 +1,4 @@
-##===- runtime/Makefile ------------------------------*- Makefile -*-===##
+##===- runtime/Makefile ------------------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,27 +6,38 @@
 # the University of Illinois Open Source License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
-# llvm/runtime Makefile:  Build all subdirectories automatically
 
 LEVEL = ..
 include $(LEVEL)/Makefile.config
 
-ifneq ($(wildcard $(LLVMGCCDIR)),)
-PARALLEL_DIRS  := GCCLibraries  libdummy  libprofile  libtrace
+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
+# build on Sparc
+ifeq ($(ARCH), Sparc)
+PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS))
+endif
 endif
 
 include $(LEVEL)/Makefile.common
 
-# Install target for libraries: Copy into the 'bytecode-libs' subdirectory
-# of LLVMGCCDIR.  (On the UIUC machines, this is in Chris's home directory.)
+# Install target for libraries: Copy into $LLVMGCCDIR/bytecode-libs
 #
 install::
 
-clean::