6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-10-26 18:20:39 +00:00
Code Issues Projects Releases Wiki Activity

Another dependency fix, prevent ObjDir from having trailing slash.

Browse Source 
- 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
This commit is contained in:
Daniel Dunbar
2008-10-03 21:24:52 +00:00
parent 3afba0ae41
commit ebb9f9b76d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.rules
View File

@@ -318,7 +318,14 @@ ifeq ($(LLVM_CROSS_COMPILING),1)
endif endif
ObjRootDir := $(PROJ_OBJ_DIR)/$(BuildMode) 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 LibDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/lib
ToolDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin ToolDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/bin
ExmplDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples ExmplDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/$(TargetMode)/examples