From: Daniel Dunbar <daniel@zuster.org>
Date: Fri, 3 Oct 2008 21:24:52 +0000 (+0000)
Subject: Another dependency fix, prevent ObjDir from having trailing slash.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ebb9f9b76db716e8731fa935d5d045bd1c5e49d8;p=oota-llvm.git

Another dependency fix, prevent ObjDir from having trailing slash.
 - It turns out this is enough to completely break dependency file
   (.d) usage (at least for my gmake).


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

diff --git a/Makefile.rules b/Makefile.rules
index 9aeb57d741e..0074560ccd0 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -318,7 +318,14 @@ ifeq ($(LLVM_CROSS_COMPILING),1)
 endif
 
 ObjRootDir  := $(PROJ_OBJ_DIR)/$(BuildMode)
-ObjDir      := $(ObjRootDir)/$(TargetMode)
+# It is very important that ObjDir not have an extra trailing
+# slash. This ends up changing the rules so that dependency file (.d)
+# information is not used at all!
+ifeq ($(TargetMode),)
+  ObjDir      := $(ObjRootDir)
+else
+  ObjDir      := $(ObjRootDir)/$(TargetMode)
+endif
 LibDir      := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/lib
 ToolDir     := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin
 ExmplDir    := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples