Avoid building the runtime libraries if llvm-gcc version 4 is detected.

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

diff --git a/Makefile b/Makefile
index b474a3a0674e65e1c1380d9c89a7d1da534230ce..a56fca48b106c3b5e85e4ffb1b6bd5fe73cd4ee8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,19 +9,24 @@
 LEVEL = .
 DIRS = lib/System lib/Support utils lib
 
+include $(LEVEL)/Makefile.common
+
 ifeq ($(MAKECMDGOALS),tools-only)
-DIRS += tools
+  DIRS += tools
 else
   ifneq ($(MAKECMDGOALS),libs-only)
-    DIRS += tools runtime docs
-    OPTIONAL_DIRS = examples projects
+    DIRS += tools
+    ifeq ($(LLVMGCC_MAJVERS),3)
+      DIRS += runtime
+    else
+      $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
+    endif
+    DIRS += docs
   endif
+  OPTIONAL_DIRS = examples projects
 endif
-
 EXTRA_DIST := test llvm.spec include
 
-include $(LEVEL)/Makefile.common
-
 # Specify options to pass to configure script when we're
 # running the dist-check target
 DIST_CHECK_CONFIG_OPTIONS = --with-llvmgccdir=$(LLVMGCCDIR)

diff --git a/runtime/Makefile b/runtime/Makefile
index a1c0152b75f622868e7b0baaaa5952a8e6d471b3..1c474df09efc824d9f0270d4116557f41388a1d2 100644 (file)
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -10,6 +10,13 @@
 LEVEL = ..
 include $(LEVEL)/Makefile.config
 
+ifneq ($(LLVMGCC_MAJVERS),3)
+PARALLEL_DIRS :=
+install all::
+       $(Echo) "Warning: The 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
@@ -26,6 +33,7 @@ endif
 ifeq ($(ARCH), Sparc)
 PARALLEL_DIRS := $(filter-out libprofile, $(PARALLEL_DIRS))
 endif
+endif
 
 include $(LEVEL)/Makefile.common