maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 19095
This commit is contained in:
Reid Spencer 2004-12-22 05:57:21 +00:00
parent 0921255067
commit 2bba41c760
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/Makefile.rules
View File

@ -211,6 +211,7 @@ ExmplDir := $(BUILD_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
LExmplDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/examples LExmplDir := $(LLVM_OBJ_ROOT)/$(BuildMode)/examples
CFERuntimeLibDir := $(LLVMGCCDIR)/lib
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Full Paths To Compiled Tools and Utilities # Full Paths To Compiled Tools and Utilities
@ -235,12 +236,6 @@ endif
ifndef GCCLD ifndef GCCLD
GCCLD := $(LLVMToolDir)/gccld$(EXEEXT) GCCLD := $(LLVMToolDir)/gccld$(EXEEXT)
endif endif
ifndef LLVMGCC
LLVMGCC := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/gcc
endif
ifndef LLVMGXX
LLVMGXX := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCCDIR)/bin/g++
endif
ifndef LDIS ifndef LDIS
LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT)
endif endif
@ -250,6 +245,8 @@ endif
ifndef LOPT ifndef LOPT
LOPT := $(LLVMToolDir)/opt$(EXEEXT) LOPT := $(LLVMToolDir)/opt$(EXEEXT)
endif endif
LLVMGCCWITHPATH := PATH=$(LLVMToolDir):$(PATH) $(LLVMGCC)
LLVMGXXWITHPATH := PATH=$(LLVMToolDir):$(PATH) $(LLVMGXX)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Adjust to user's request # Adjust to user's request
@ -311,7 +308,8 @@ CPP.Flags += -I$(BUILD_OBJ_DIR) \
Compile.C = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags) Compile.C = $(CC) $(CPP.Flags) $(CompileCommonOpts) -c $(C.Flags)
LTCompile.C = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.C) 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 Compile.CXX = $(CXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c
LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX) LTCompile.CXX = $(LIBTOOL) $(LibTool.Flags) --mode=compile $(Compile.CXX)
BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c BCCompile.CXX = $(LLVMGXX) $(CPP.Flags) $(CompileCommonOpts) $(CXX.Flags) -c
@ -517,7 +515,7 @@ endif
ifdef MODULE_NAME ifdef MODULE_NAME
Module := $(LibDir)/$(MODULE_NAME).bc Module := $(LibDir)/$(MODULE_NAME).bc
LinkModule := $(LLVMGCC) -shared -nostdlib LinkModule := $(LLVMGCCWITHPATH) -shared -nostdlib
ifdef EXPORTED_SYMBOL_FILE ifdef EXPORTED_SYMBOL_FILE
LinkMOdule += -Xlinker -internalize-public-api-file=$(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) all-local:: $(LibName.BCA)
ifdef EXPORTED_SYMBOL_FILE ifdef EXPORTED_SYMBOL_FILE
BCLinkLib = $(LLVMGCC) -shared -nostdlib -Xlinker \ BCLinkLib = $(LLVMGCCWITHPATH) -shared -nostdlib -Xlinker \
-internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE)
$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \