Fix PR458:

* Don't include Makefile.rules in set of preconditions, it never has to be
  copied to objdir.
* Enable the "update makefile first before executing targets" feature in
  gnu make by *not* using a full path to the Makefile in the rule.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17920 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.rules b/Makefile.rules
index 3f817e334039400cf9bfbdb28ef0e6c92c8bc385..93b77886db0ce370504dd0bcd384abb12913c6a2 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -59,8 +59,8 @@ $(UserTargets)::
 # PRECONDITIONS: that which must be built/checked first
 ################################################################################
 
-SrcMakefiles       := $(filter %Makefile %Makefile.rules %Makefile.tests \
-                      %Makefile.JIT,$(wildcard $(BUILD_SRC_DIR)/Makefile*))
+SrcMakefiles       := $(filter %Makefile %Makefile.tests %Makefile.JIT,\
+                      $(wildcard $(BUILD_SRC_DIR)/Makefile*))
 ObjMakefiles       := $(subst $(BUILD_SRC_DIR),$(BUILD_OBJ_DIR),$(SrcMakefiles))
 ConfigureScript    := $(LLVM_SRC_ROOT)/configure
 ConfigStatusScript := $(LLVM_OBJ_ROOT)/config.status
@@ -104,7 +104,7 @@ $(MakefileConfig): $(MakefileConfigIn) $(ConfigStatusScript)
 #------------------------------------------------------------------------
 ifneq ($(BUILD_OBJ_DIR),$(BUILD_SRC_DIR))
 
-$(BUILD_OBJ_DIR)/Makefile : $(BUILD_SRC_DIR)/Makefile
+Makefile: $(BUILD_SRC_DIR)/Makefile
        $(Echo) "Updating Makefile"
        $(Verb) $(MKDIR) $(@D)
        $(Verb) cp -f $< $@