[clang] a489e11 - [Fuchsia] Use cleaner method of adding driver binary

Alex Brachet via cfe-commits cfe-commits at lists.llvm.org
Sun Feb 19 19:57:32 PST 2023


Author: Alex Brachet
Date: 2023-02-20T03:57:23Z
New Revision: a489e11439e36c7e0ec83b28a6fb1596a5c21faa

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

LOG: [Fuchsia] Use cleaner method of adding driver binary

Added: 
    

Modified: 
    clang/cmake/caches/Fuchsia-stage2.cmake

Removed: 
    


################################################################################
diff  --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 464f7f89fcea..54a64a84f231 100644
--- a/clang/cmake/caches/Fuchsia-stage2.cmake
+++ b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -28,6 +28,7 @@ if(WIN32)
   set(LLVM_USE_CRT_RELEASE "MT" CACHE STRING "")
 else()
   set(LLVM_TOOL_LLVM_DRIVER_BUILD ON CACHE BOOL "")
+  set(LLVM_DRIVER_TARGET llvm-driver)
 endif()
 
 set(CLANG_DEFAULT_CXX_STDLIB libc++ CACHE STRING "")
@@ -294,6 +295,7 @@ set(LLVM_TOOLCHAIN_TOOLS
   llvm-cxxfilt
   llvm-debuginfod-find
   llvm-dlltool
+  ${LLVM_DRIVER_TARGET}
   llvm-dwarfdump
   llvm-dwp
   llvm-ifs
@@ -322,10 +324,6 @@ set(LLVM_TOOLCHAIN_TOOLS
   scan-build-py
   CACHE STRING "")
 
-if(NOT WIN32)
-  list(APPEND LLVM_TOOLCHAIN_TOOLS llvm-driver)
-endif()
-
 set(_FUCHSIA_DISTRIBUTION_COMPONENTS
   clang
   lld


        


More information about the cfe-commits mailing list