aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2005-05-19 21:03:11 +0000
committerReid Spencer <rspencer@reidspencer.com>2005-05-19 21:03:11 +0000
commit5da2d0843375fbee77ea303abfc47808bacfc181 (patch)
tree544defe597ba580ed3e7dc0549cd18b62c0af4b0
parentaa8bc430076de2fdba5708ac10940c740b8eb4f8 (diff)
Make sure that tool names don't have any leading or trailing spaces in them.
If they do, it screws up the concatenation of the .exe suffix on cygwin. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22141 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile.rules4
-rw-r--r--tools/llvm-ar/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 1f21e5d848..c130368b75 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -881,9 +881,9 @@ ifdef TOOLNAME
# Set up variables for building a tool.
#---------------------------------------------------------
ifdef EXAMPLE_TOOL
-ToolBuildPath := $(ExmplDir)/$(TOOLNAME)$(EXEEXT)
+ToolBuildPath := $(ExmplDir)/$(strip $(TOOLNAME))$(EXEEXT)
else
-ToolBuildPath := $(ToolDir)/$(TOOLNAME)$(EXEEXT)
+ToolBuildPath := $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT)
endif
#---------------------------------------------------------
diff --git a/tools/llvm-ar/Makefile b/tools/llvm-ar/Makefile
index 5d0694e1ce..3375f9ee36 100644
--- a/tools/llvm-ar/Makefile
+++ b/tools/llvm-ar/Makefile
@@ -8,7 +8,7 @@
##===----------------------------------------------------------------------===##
LEVEL = ../..
-TOOLNAME = llvm-ar
+TOOLNAME = llvm-ar
USEDLIBS = LLVMArchive.a LLVMBCReader \
LLVMCore LLVMSupport.a LLVMbzip2 LLVMSystem.a