diff options
| -rw-r--r-- | Makefile.rules | 17 | ||||
| -rw-r--r-- | test/Makefile.tests | 15 |
2 files changed, 15 insertions, 17 deletions
diff --git a/Makefile.rules b/Makefile.rules index d198d683f2..ba9716e4c8 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -256,10 +256,23 @@ LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/gcc LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++ #-------------------------------------------------------------------------- -# Some of the compiled LLVM tools which are used for compilation of runtime -# libraries. +# The compiled LLVM tools # + LLVMAS := $(LLVMTOOLCURRENT)/llvm-as$(EXEEXT) +# Find the location of the platform specific LLVM GCC libraries +LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a)) +# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by +# Makefile.rules) LLI = $(LLVMTOOLCURRENT)/lli$(EXEEXT) +LLC = $(LLVMTOOLCURRENT)/llc$(EXEEXT) +LGCCAS = $(LLVMTOOLCURRENT)/gccas$(EXEEXT) +LGCCLD = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib +LDIS = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT) +LOPT = $(LLVMTOOLCURRENT)/opt$(EXEEXT) +LLINK = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT) +LPROF = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT) +LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT) +LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT) ########################################################################### diff --git a/test/Makefile.tests b/test/Makefile.tests index 5c908c043e..c49cedd5cf 100644 --- a/test/Makefile.tests +++ b/test/Makefile.tests @@ -34,21 +34,6 @@ endif .PRECIOUS: Output/%.llvm.bc .PRECIOUS: Output/%.llvm -# Find the location of the platform specific LLVM GCC libraries -LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a)) - -# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules) -LLI = $(LLVMTOOLCURRENT)/lli$(EXEEXT) -LLC = $(LLVMTOOLCURRENT)/llc$(EXEEXT) -LGCCAS = $(LLVMTOOLCURRENT)/gccas$(EXEEXT) -LGCCLD = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib -LDIS = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT) -LOPT = $(LLVMTOOLCURRENT)/opt$(EXEEXT) -LLINK = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT) -LPROF = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT) -LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT) -LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT) - LCCFLAGS += -O2 -Wall LCXXFLAGS += -O2 -Wall LLCFLAGS = |