aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2003-11-07 04:39:53 +0000
committerChris Lattner <sabre@nondot.org>2003-11-07 04:39:53 +0000
commit94ed65f864d0ae6e827ce36507ccf0217d58bc51 (patch)
tree9f4db72eb4c826822e9e820bb24fb2c820e55874
parentc1e0d7876b3438e819504b1684bbeb466216b4a9 (diff)
Fix a really bad build problem for users who have .o in their build directory!
Thanks to Reid Spencer for figuring this out! :) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9763 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules
index d3a6585e36..64ef77d966 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -800,11 +800,11 @@ SourceDepend := $(SourceBaseNames:%=$(BUILD_OBJ_DIR)/Depend/%.d)
# Create dependencies for the *.cpp files...
$(BUILD_OBJ_DIR)/Depend/%.d: %.cpp $(BUILD_OBJ_DIR)/Depend/.dir
- $(VERB) $(Depend) $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
+ $(VERB) $(Depend) $< | $(SED) 's|\.o$$|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
# Create dependencies for the *.c files...
$(BUILD_OBJ_DIR)/Depend/%.d: %.c $(BUILD_OBJ_DIR)/Depend/.dir
- $(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
+ $(VERB) $(DependC) -o $@ $< | $(SED) 's|\.o$$|\.lo|' | $(SED) 's|$*\.lo *|$(BUILD_OBJ_DIR)/Release/& $(BUILD_OBJ_DIR)/Profile/& $(BUILD_OBJ_DIR)/Debug/& $(BUILD_OBJ_DIR)/Depend/$(@F)|g' > $@
#
# Autoconf Dependencies.