diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-12-22 05:57:21 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-12-22 05:57:21 +0000 |
| commit | 2f138e726f6b5a44e8a0b82abc94ae5608925297 (patch) | |
| tree | 29e9c9b4bd711bd66d0131489dae131e4cd3f847 | |
| parent | 7908035f47ee637a2e9b585e3057b0f974dc75ca (diff) | |
| download | llvm-2f138e726f6b5a44e8a0b82abc94ae5608925297.tar.gz llvm-2f138e726f6b5a44e8a0b82abc94ae5608925297.tar.bz2 llvm-2f138e726f6b5a44e8a0b82abc94ae5608925297.tar.xz | |
For PR432:
* Cleanup LLVMGCXX and LLVMGCC by providing LLVMGXXWITHPATH and LLVMGCCWITHPATH
variables that add the $(LLVMToolDir) to the path so the CFE tools can find
the right LLVM tools they depend on.
* Standardize the name of a variable: cferuntime_libdir -> CFERuntimeLibDir
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19095 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.rules b/Makefile.rules index dd0d5c7440..94252f29a6 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -211,6 +211,7 @@ ExmplDir := $(BUILD_OBJ_ROOT)/$(BuildMode)/examples LLVMLibDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/lib LLVMToolDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/bin LExmplDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/examples +CFERuntimeLibDir := $(LLVMGCCDIR)/lib #-------------------------------------------------------------------- # Full Paths To Compiled Tools and Utilities @@ -235,12 +236,6 @@ endif ifndef GCCLD GCCLD := $(LLVMToolDir)/gccld$(EXEEXT) endif -ifndef LLVMGCC -LLVMGCC := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/gcc -endif -ifndef LLVMGXX -LLVMGXX := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++ -endif ifndef LDIS LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) endif @@ -250,6 +245,8 @@ endif ifndef LOPT LOPT := $(LLVMToolDir)/opt$(EXEEXT) endif +LLVMGCCWITHPATH := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC) +LLVMGXXWITHPATH := PATH=$(LLVMToolDir):$(PATH) $(LLVMGXX) #-------------------------------------------------------------------- # Adjust to user's request @@ -311,7 +308,8 @@ CPP.Flags += -I$(BUILD_OBJ_DIR) \ Compile.C = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags) LTCompile.C = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C) -BCCompile.C = $(LLVMGCC) $(CPP.Flags) $(CompileCommonOpts) $(C.Flags) -c +BCCompile.C = $(LLVMGCCWITHPATH) $(CPP.Flags) $(CompileCommonOpts) \ + $(C.Flags) -c Compile.CXX = $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX) BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c @@ -517,7 +515,7 @@ endif ifdef MODULE_NAME Module := $(LibDir)/$(MODULE_NAME).bc -LinkModule := $(LLVMGCC) -shared -nostdlib +LinkModule := $(LLVMGCCWITHPATH) -shared -nostdlib ifdef EXPORTED_SYMBOL_FILE LinkMOdule += -Xlinker -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) @@ -615,7 +613,7 @@ BCCompile.CXX += -Wa,-strip-debug all-local:: $(LibName.BCA) ifdef EXPORTED_SYMBOL_FILE -BCLinkLib = $(LLVMGCC) -shared -nostdlib -Xlinker \ +BCLinkLib = $(LLVMGCCWITHPATH) -shared -nostdlib -Xlinker \ -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ |