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).

llvm-svn: 57030
This commit is contained in:
Daniel Dunbar 2008-10-03 21:24:52 +00:00
parent 0d22d8ebdb
commit a2c75a73f3

View File

@ -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