[llvm-commits] [llvm] r57030 - /llvm/trunk/Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Fri Oct  3 16:24:52 2008
New Revision: 57030

URL: http://llvm.org/viewvc/llvm-project?rev=57030&view=rev
Log:
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).

Modified:
    llvm/trunk/Makefile.rules

Modified: llvm/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=57030&r1=57029&r2=57030&view=diff

==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Fri Oct  3 16:24:52 2008
@@ -318,7 +318,14 @@
 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