From a489e11439e36c7e0ec83b28a6fb1596a5c21faa Mon Sep 17 00:00:00 2001
From: Alex Brachet <abrachet@google.com>
Date: Mon, 20 Feb 2023 03:57:23 +0000
Subject: [PATCH] [Fuchsia] Use cleaner method of adding driver binary

---
 clang/cmake/caches/Fuchsia-stage2.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
index 464f7f8..54a64a8 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
-- 
2.7.4