aboutsummaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorJordan Rose <jordan_rose@apple.com>2012-10-04 00:47:59 +0000
committerJordan Rose <jordan_rose@apple.com>2012-10-04 00:47:59 +0000
commit81be6bfd66a29494a0a9106b738a2d9bd520f603 (patch)
treebcdf474fd15e83451cc7a0a722500b5802e4fa60 /Makefile.rules
parent72fd0a9448a9d9eced8f475741e4a1ee543253e0 (diff)
Make sure 'prefix-clang++' is aliased to 'prefix-clang', not 'clang'.
When aliasing tools, rather than using the base TOOLEXENAME, we should instead use the built tool's basename (for 'make') or the installed tool's basename (for 'make install'). This should not cause any changes for anyone building unprefixed 'clang' and 'clang++' tools. Patch by Rick Foos! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165189 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.rules b/Makefile.rules
index f74c6f5ada..030955b690 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -1524,7 +1524,7 @@ ifneq ($(strip $(ToolAliasBuildPath)),)
$(ToolAliasBuildPath): $(ToolBuildPath)
$(Echo) Creating $(BuildMode) Alias $(TOOLALIAS) $(StripWarnMsg)
$(Verb) $(RM) -f $(ToolAliasBuildPath)
- $(Verb) $(AliasTool) $(TOOLEXENAME) $(ToolAliasBuildPath)
+ $(Verb) $(AliasTool) $(notdir $(ToolBuildPath)) $(ToolAliasBuildPath)
$(Echo) ======= Finished Creating $(BuildMode) Alias $(TOOLALIAS) \
$(StripWarnMsg)
endif
@@ -1563,7 +1563,7 @@ install-local:: $(DestToolAlias)
$(DestToolAlias): $(DestTool)
$(Echo) Installing $(BuildMode) $(DestToolAlias)
$(Verb) $(RM) -f $(DestToolAlias)
- $(Verb) $(AliasTool) $(TOOLEXENAME) $(DestToolAlias)
+ $(Verb) $(AliasTool) $(notdir $(DestTool)) $(DestToolAlias)
uninstall-local::
$(Echo) Uninstalling $(BuildMode) $(DestToolAlias)