diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2008-10-03 21:24:52 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2008-10-03 21:24:52 +0000 |
| commit | ebb9f9b76db716e8731fa935d5d045bd1c5e49d8 (patch) | |
| tree | f6495205994a774f6927da6bf8cf52a66a879326 | |
| parent | 3afba0ae416acd62aca0ddda454538fbe99d1571 (diff) | |
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
| -rw-r--r-- | Makefile.rules | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules index 9aeb57d741..0074560ccd 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 |