Allow PackedType to be constructed with an abstract type.

[oota-llvm.git] / runtime / Makefile

diff --git a/runtime/Makefile b/runtime/Makefile
index d8bc24a6f12cc7a96f506cd67fe6387ac6010fe2..d1165800c75b38616c4f36cbb06f3d8d69f68433 100644 (file)
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -1,4 +1,4 @@
-##===- runtime/Makefile ------------------------------*- Makefile -*-===##
+##===- runtime/Makefile ------------------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,26 +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  := $(sort $(filter-out Makefile, $(filter-out README.txt, $(filter-out Output, $(filter-out CVS, $(notdir $(wildcard $(SourceDir)/*)))))))
+
+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 GC
 else
 PARALLEL_DIRS  := 
-all ::
-       @echo '********' Warning: Your LLVMGCCDIR is set incorrectly.  Double-check 
+install all ::
+       @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 gcc install directory in chris's
-# tree...
+# Install target for libraries: Copy into $LLVMGCCDIR/bytecode-libs
 #
 install::
 
-clean::