From 5da2d0843375fbee77ea303abfc47808bacfc181 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 19 May 2005 21:03:11 +0000 Subject: [PATCH] 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 --- Makefile.rules | 4 ++-- tools/llvm-ar/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index 1f21e5d848e..c130368b753 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 5d0694e1ce4..3375f9ee365 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 -- 2.34.1