diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-02-23 09:28:50 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-02-23 09:28:50 +0000 |
| commit | 112257d290eaa77c2c63646b450bdadeaa3515e6 (patch) | |
| tree | c414ccd9862cb1ae919342b7b5b3d538af142f8d /Makefile.rules | |
| parent | a04942b196e49fb7b486d026a8ce811d74374bb3 (diff) | |
| download | llvm-112257d290eaa77c2c63646b450bdadeaa3515e6.tar.gz llvm-112257d290eaa77c2c63646b450bdadeaa3515e6.tar.bz2 llvm-112257d290eaa77c2c63646b450bdadeaa3515e6.tar.xz | |
Eliminate CFERuntimeLibDir make variable, this shouldn't be needed.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96932 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.rules b/Makefile.rules index e6f4290d8f..215df8628c 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -493,7 +493,6 @@ ExmplDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/examples LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin LLVMExmplDir:= $(LLVM_OBJ_ROOT)/$(BuildMode)/examples -CFERuntimeLibDir := $(LLVMGCCDIR)/lib #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities @@ -964,7 +963,7 @@ $(warning Modules require llvm-gcc but no llvm-gcc is available ****) else Module := $(LibDir)/$(MODULE_NAME).bc -LinkModule := $(LLVMLD) -L$(CFERuntimeLibDir) -r +LinkModule := $(LLVMLD) -r ifdef EXPORTED_SYMBOL_FILE @@ -1092,8 +1091,7 @@ else all-local:: $(LibName.BCA) ifdef EXPORTED_SYMBOL_FILE -BCLinkLib = $(LLVMLD) -L$(CFERuntimeLibDir) \ - -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) +BCLinkLib = $(LLVMLD) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(LLVMLD) \ $(LLVMToolDir)/llvm-ar |