[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.205 -> 1.206
---
Log message:

* Actually ignore build errors in optional directories
* Use LLVM_SRC_ROOT as the anchor for the Target.td file
* Use MFLAGS instead of MAKEFLAGS for recursive makes so we don't try
  to build a target "w" or "s" mysteriously.


---
Diffs of the changes:  (+4 -4)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.205 llvm/Makefile.rules:1.206
--- llvm/Makefile.rules:1.205	Fri Oct 22 18:06:30 2004
+++ llvm/Makefile.rules	Sat Oct 23 03:19:37 2004
@@ -282,7 +282,7 @@
 	      $(MKDIR) $$dir; \
 	      cp $(BUILD_SRC_DIR)/$$dir/Makefile $$dir/Makefile; \
 	    fi; \
-	    ($(MAKE) -C$$dir $@ $(MFLAGS)) || exit 1; \
+	    ($(MAKE) -C$$dir $@ $(MFLAGS)) || exit 0; \
 	  fi \
 	done
 endif
@@ -575,7 +575,7 @@
 
 ifdef TARGET
 
-TDFILES := $(strip $(wildcard $(BUILD_SRC_DIR)/*.td) $(BUILD_SRC_ROOT)/lib/Target/Target.td)
+TDFILES := $(strip $(wildcard $(BUILD_SRC_DIR)/*.td) $(LLVM_SRC_ROOT)/lib/Target/Target.td)
 
 $(BUILT_SOURCES): $(TDFILES) 
 
@@ -756,7 +756,7 @@
 $(MAKE_CONFIG): $(MAKE_CONFIG_IN)
 	@$(ECHO) Regenerating $@
 	$(VERB) cd $(LLVM_OBJ_ROOT) ; $(CONFIG_STATUS) Makefile.config
-	$(VERB) $(MAKE) $(MAKEFLAGS) $(MAKECMDGOALS)
+	$(VERB) $(MAKE) $(MFLAGS) $(MAKECMDGOALS)
 	@exit 0;
 
 #------------------------------------------------------------------------
@@ -768,7 +768,7 @@
 	@$(ECHO) "Updating Makefile from : $(dir $<)"
 	$(VERB) $(MKDIR) $(@D)
 	$(VERB) cp -f $< $@
-	$(VERB) $(MAKE) $(MAKEFLAGS) $(MAKECMDGOALS)
+	$(VERB) $(MAKE) $(MFLAGS) $(MAKECMDGOALS)
 	@exit 0;
 endif