[llvm-commits] CVS: llvm/Makefile

[Reid Spencer]

Changes in directory llvm:

Makefile updated: 1.51 -> 1.52
---
Log message:

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


---
Diffs of the changes:  (+11 -6)

 Makefile |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)


Index: llvm/Makefile
diff -u llvm/Makefile:1.51 llvm/Makefile:1.52
--- llvm/Makefile:1.51	Wed Aug 24 23:59:49 2005
+++ llvm/Makefile	Thu Apr  6 17:15:50 2006
@@ -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)