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

diff --git a/Makefile.rules b/Makefile.rules
index 1f21e5d848e26f07abd5b4264f1312a00ca234bb..c130368b7539069f061b65439c9b2b2b854e828f 100644 (file)
--- 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 5d0694e1ce4463fdb91a04c2d81f38d3e5639e6a..3375f9ee3650608317d164e5c1cdaca3a2067892 100644 (file)
--- 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