Changes in directory llvm:
Makefile updated: 1.62 -> 1.63
---
Log message:
Revamp this to use filter-out, which makes the logic simpler and not nested.
This restores building of examples and projects!
---
Diffs of the changes: (+18 -21)
Makefile | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
Index: llvm/Makefile
diff -u llvm/Makefile:1.62 llvm/Makefile:1.63
--- llvm/Makefile:1.62 Fri Jun 2 17:41:18 2006
+++ llvm/Makefile Wed Jul 26 14:10:34 2006
@@ -7,39 +7,35 @@
#
#===------------------------------------------------------------------------===#
-LEVEL = .
-DIRS = lib/System lib/Support utils lib/VMCore lib
+LEVEL := .
+DIRS := lib/System lib/Support utils lib/VMCore lib tools runtime docs
+OPTIONAL_DIRS := examples projects
+EXTRA_DIST := test llvm.spec include win32 Xcode
include $(LEVEL)/Makefile.config
+# llvm-gcc4 doesn't need runtime libs.
+ifeq ($(LLVMGCC_MAJVERS),4)
+ DIRS := $(filter-out runtime, $(DIRS))
+endif
-ifeq ($(MAKECMDGOALS),tools-only)
- DIRS += tools
-else
- ifneq ($(MAKECMDGOALS),libs-only)
- DIRS += tools
- ifneq ($(LLVMGCC_MAJVERS),4)
- DIRS += runtime
- else
- $(warning Skipping runtime libraries, llvm-gcc 4 detected.)
- endif
+ifeq ($(MAKECMDGOALS),libs-only)
+ DIRS := $(filter-out tools runtime docs, $(DIRS))
+ OPTIONAL_DIRS :=
+endif
- DIRS += docs
- endif
+ifeq ($(MAKECMDGOALS),tools-only)
+ DIRS := $(filter-out runtime docs, $(DIRS))
+ OPTIONAL_DIRS :=
endif
-# Don't install utils, they are only used to build LLVM.
-#
+# Don't install utils, examples, or projects they are only used to
+# build LLVM.
ifeq ($(MAKECMDGOALS),install)
DIRS := $(filter-out utils, $(DIRS))
-
- # Don't install examples or projects.
OPTIONAL_DIRS :=
endif
-
-EXTRA_DIST := test llvm.spec include win32 Xcode
-
# Include the main makefile machinery.
include $(LLVM_SRC_ROOT)/Makefile.rules
@@ -103,3 +99,4 @@
check-llvm2cpp:
$(MAKE) check TESTSUITE=Feature RUNLLVM2CPP=1
+
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
