diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-10-23 08:19:37 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-10-23 08:19:37 +0000 |
| commit | 282e13c9422613538da2a02913eab4b32fa2143b (patch) | |
| tree | 748507226e3dfee6d84e2973f9771a8872ca54de | |
| parent | 70b3e231a7c43fba02c203ee68e0b6da44136614 (diff) | |
| download | bcm5719-llvm-282e13c9422613538da2a02913eab4b32fa2143b.tar.gz bcm5719-llvm-282e13c9422613538da2a02913eab4b32fa2143b.zip | |
* 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.
llvm-svn: 17186
| -rw-r--r-- | llvm/Makefile.rules | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index cd82e139582..2e004a2f1a6 100644 --- a/llvm/Makefile.rules +++ b/llvm/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 |
