[llvm] f1da04b - [llvm-driver] Check more specific tools first

[Alex Brachet via llvm-commits]

Author: Alex Brachet
Date: 2023-04-17T21:39:13Z
New Revision: f1da04b7357bf0efef2ab881f31bdfb30c3e3b10

URL: https://github.com/llvm/llvm-project/commit/f1da04b7357bf0efef2ab881f31bdfb30c3e3b10
DIFF: https://github.com/llvm/llvm-project/commit/f1da04b7357bf0efef2ab881f31bdfb30c3e3b10.diff

LOG: [llvm-driver] Check more specific tools first

We allow tools to be called {tool}-{suffix} to support tools being
called something like clang-17. Many clang tools follow this pattern
too for example, clang-scan-deps. It is pure luck wether clang or
clang-scan-deps will appear first in the LLVMDriverTools.def file. If
the former appears first, clang-scan-deps will match against clang,
which is not preferable. Instead we can control the order that tools
are checked so that we always look at more specific tool names first.

Differential Revision: https://reviews.llvm.org/D148543

Added: 
    

Modified: 
    llvm/tools/llvm-driver/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-driver/CMakeLists.txt b/llvm/tools/llvm-driver/CMakeLists.txt
index e709cd7fdb56d..23cc37354eaa3 100644
--- a/llvm/tools/llvm-driver/CMakeLists.txt
+++ b/llvm/tools/llvm-driver/CMakeLists.txt
@@ -3,6 +3,8 @@ get_property(LLVM_DRIVER_OBJLIBS GLOBAL PROPERTY LLVM_DRIVER_OBJLIBS)
 
 get_property(LLVM_DRIVER_TOOLS GLOBAL PROPERTY LLVM_DRIVER_TOOLS)
 
+list(SORT LLVM_DRIVER_TOOLS)
+list(REVERSE LLVM_DRIVER_TOOLS)
 foreach(tool ${LLVM_DRIVER_TOOLS})
   string(REPLACE "-" "_" tool_entry ${tool})
   get_property(tool_aliases GLOBAL PROPERTY LLVM_DRIVER_TOOL_ALIASES_${tool})