Reapply my less-lock-contention-in-leak-detector patch, now with new files

[oota-llvm.git] / runtime / Makefile

diff --git a/runtime/Makefile b/runtime/Makefile
index 6f05ed2d5f5fcc980f23fb613e23ce1f431fa80b..9937c11e3bc3b0905c948c8efb329009822f3fe7 100644 (file)
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -1,13 +1,35 @@
-# Libraries Makefile:  Build all subdirectories automatically
+##===- runtime/Makefile ------------------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+LEVEL = ..
+include $(LEVEL)/Makefile.config
+
+ifneq ($(wildcard $(LLVMGCC)),)
+PARALLEL_DIRS  := libprofile
+else
+PARALLEL_DIRS  := 
+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
+       @echo '********' Warning: installed,and re-run configure if it does not.
+endif
 
-LEVEL = ../..
-PARALLEL_DIRS  := $(sort $(filter-out Output/, $(filter-out CVS/, $(wildcard */))))
+# 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
 
-include ${LEVEL}/Makefile.common
+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::