aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2004-06-01 19:06:43 +0000
committerChris Lattner <sabre@nondot.org>2004-06-01 19:06:43 +0000
commit396d96bd272a8d335345685bf063a127bbac2936 (patch)
tree58d7f91ba5de7f6077e28641f52b69061528d406
parente6d468f6f77b52e5ccc4592d1024829d8f5cf70b (diff)
Make tool names end with .exe on windows. This isn't needed to run the
tools, but is required for rules that depend on the executables, e.g.: a: b $(LLVMAS) git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13926 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules8
-rw-r--r--test/Makefile.tests18
2 files changed, 13 insertions, 13 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 59eec663af..25a866d18a 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -244,10 +244,10 @@ endif
#--------------------------------------------------------------------------
# Utilities used while building the LLVM tree, which live in the utils dir
#
-BURG := $(LLVMTOOLCURRENT)/burg
+BURG := $(LLVMTOOLCURRENT)/burg$(EXEEXT)
RunBurg := $(BURG) $(BURG_OPTS)
-TBLGEN := $(LLVMTOOLCURRENT)/tblgen
-LGCCLDPROG := $(LLVMTOOLCURRENT)/gccld
+TBLGEN := $(LLVMTOOLCURRENT)/tblgen$(EXEEXT)
+LGCCLDPROG := $(LLVMTOOLCURRENT)/gccld$(EXEEXT)
#--------------------------------------------------------------------------
# The LLVM GCC front-end in C and C++ flavors
@@ -259,7 +259,7 @@ LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++
# Some of the compiled LLVM tools which are used for compilation of runtime
# libraries.
#
-LLVMAS := $(LLVMTOOLCURRENT)/llvm-as
+LLVMAS := $(LLVMTOOLCURRENT)/llvm-as$(EXEEXT)
###########################################################################
diff --git a/test/Makefile.tests b/test/Makefile.tests
index 33f92f66b5..4b961bb826 100644
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -38,16 +38,16 @@ endif
LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI = $(LLVMTOOLCURRENT)/lli
-LLC = $(LLVMTOOLCURRENT)/llc
-LGCCAS = $(LLVMTOOLCURRENT)/gccas
+LLI = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
+LLC = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
+LGCCAS = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
LGCCLD = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
-LDIS = $(LLVMTOOLCURRENT)/llvm-dis
-LOPT = $(LLVMTOOLCURRENT)/opt
-LLINK = $(LLVMTOOLCURRENT)/llvm-link
-LPROF = $(LLVMTOOLCURRENT)/llvm-prof
-LANALYZE = $(LLVMTOOLCURRENT)/analyze
-LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint
+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