Changes in directory llvm:
Makefile updated: 1.58 -> 1.59
Makefile.rules updated: 1.369 -> 1.370
---
Log message:
Make some changes suggested by Chris:
1. Remove the LLVM_DO_NOT_BUILD feature (not needed any more)
2. Ensure that lib/VMCore gets built first. This needs to be done because
VMCore now uses tblgen to generate the Intrinsics header which are
needed in other libraries. In parallel builds, this can cause problems.
---
Diffs of the changes: (+5 -13)
Makefile | 2 +-
Makefile.rules | 16 ++++------------
2 files changed, 5 insertions(+), 13 deletions(-)
Index: llvm/Makefile
diff -u llvm/Makefile:1.58 llvm/Makefile:1.59
--- llvm/Makefile:1.58 Wed Apr 12 15:53:14 2006
+++ llvm/Makefile Wed May 17 17:55:35 2006
@@ -7,7 +7,7 @@
#
#===------------------------------------------------------------------------===#
LEVEL = .
-DIRS = lib/System lib/Support utils lib
+DIRS = lib/System lib/Support utils lib/VMCore lib
include $(LEVEL)/Makefile.config
Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.369 llvm/Makefile.rules:1.370
--- llvm/Makefile.rules:1.369 Tue May 16 01:51:02 2006
+++ llvm/Makefile.rules Wed May 17 17:55:35 2006
@@ -472,9 +472,7 @@
$(MKDIR) $$dir; \
$(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
fi; \
- if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
- ($(MAKE) -C $$dir $@ ) || exit 1; \
- fi ; \
+ ($(MAKE) -C $$dir $@ ) || exit 1; \
done
endif
@@ -489,9 +487,7 @@
$(MKDIR) $$dir; \
$(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
fi; \
- if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
- ($(MAKE) -C $$dir $@ ) || exit 0; \
- fi ; \
+ ($(MAKE) -C $$dir $@ ) || exit 0; \
done
endif
@@ -517,9 +513,7 @@
$(MKDIR) $(@D); \
$(CP) $(PROJ_SRC_DIR)/$(@D)/Makefile $(@D)/Makefile; \
fi; \
- if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
- $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ; \
- fi
+ $(MAKE) -C $(@D) $(subst $(@D)/.make,,$@) ;
endif
#---------------------------------------------------------
@@ -537,9 +531,7 @@
$(MKDIR) $$dir; \
$(CP) $(PROJ_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
fi; \
- if [ ! -f $$dir/LLVM_DO_NOT_BUILD ]; then \
- ($(MAKE) -C$$dir $@ ) || exit 1; \
- fi ; \
+ ($(MAKE) -C$$dir $@ ) || exit 1; \
fi \
done
endif
_______________________________________________
llvm-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
