summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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