Make sure 'prefix-clang++' is aliased to 'prefix-clang', not 'clang'.
authorJordan Rose <jordan_rose@apple.com>
Thu, 4 Oct 2012 00:47:59 +0000 (00:47 +0000)
committerJordan Rose <jordan_rose@apple.com>
Thu, 4 Oct 2012 00:47:59 +0000 (00:47 +0000)
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

Makefile.rules

index f74c6f5..030955b 100644 (file)
@@ -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)