6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-12 13:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate CFERuntimeLibDir make variable, this shouldn't be needed.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96932 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-02-23 09:28:50 +00:00
parent a04942b196
commit 112257d290
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.rules
View File

@ -493,7 +493,6 @@ ExmplDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/examples
LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib
LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples
CFERuntimeLibDir := $(LLVMGCCDIR)/lib
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Full Paths To Compiled Tools and Utilities # Full Paths To Compiled Tools and Utilities
@ -964,7 +963,7 @@ $(warning Modules require llvm-gcc but no llvm-gcc is available ****)
else else
Module := $(LibDir)/$(MODULE_NAME).bc Module := $(LibDir)/$(MODULE_NAME).bc
LinkModule := $(LLVMLD) -L$(CFERuntimeLibDir) -r LinkModule := $(LLVMLD) -r
ifdef EXPORTED_SYMBOL_FILE ifdef EXPORTED_SYMBOL_FILE
@ -1092,8 +1091,7 @@ else
all-local:: $(LibName.BCA) all-local:: $(LibName.BCA)
ifdef EXPORTED_SYMBOL_FILE ifdef EXPORTED_SYMBOL_FILE
BCLinkLib = $(LLVMLD) -L$(CFERuntimeLibDir) \ BCLinkLib = $(LLVMLD) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
-internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMLD) \ $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMLD) \
$(LLVMToolDir)/llvm-ar $(LLVMToolDir)/llvm-ar