From c64b2b350d21ff290f7f9d3a9cf124e0f8930bd5 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sat, 23 Oct 2004 08:19:37 +0000
Subject: [PATCH] * 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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17186 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Makefile.rules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index cd82e139582..2e004a2f1a6 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -282,7 +282,7 @@ $(ALL_TARGETS)::
 	      $(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 @@ $(OBJDIR)/%.bc: %.ll $(OBJDIR)/.dir $(LLVMAS)
 
 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 @@ $(CONFIG_STATUS): $(CONFIGURE)
 $(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 @@ $(OBJMKFILE): $(SRCMKFILE)
 	@$(ECHO) "Updating Makefile from : $(dir $<)"
 	$(VERB) $(MKDIR) $(@D)
 	$(VERB) cp -f $< $@
-	$(VERB) $(MAKE) $(MAKEFLAGS) $(MAKECMDGOALS)
+	$(VERB) $(MAKE) $(MFLAGS) $(MAKECMDGOALS)
 	@exit 0;
 endif