From ba47bcdb7cf3496a0fca5c17931217fce35ef6d4 Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Mon, 16 Dec 2024 14:17:08 -0700
Subject: [PATCH] Fix: Deps: Fix building dpcpp on many core box

This applies upstream PR 13328 to our copy of dpcpp, which enables
building dpcpp on a many core box. I Upgraded my build env and
ran into this issue.

No rebuilds required, build time fix only.
---
 build_files/build_environment/cmake/dpcpp.cmake      |  5 ++++-
 .../build_environment/patches/dpcpp_13328.diff       | 12 ++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 build_files/build_environment/patches/dpcpp_13328.diff

diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake
index f04b83c93ed..34a0b3a5e04 100644
--- a/build_files/build_environment/cmake/dpcpp.cmake
+++ b/build_files/build_environment/cmake/dpcpp.cmake
@@ -108,7 +108,10 @@ ExternalProject_Add(external_dpcpp
 
   PATCH_COMMAND ${PATCH_CMD} -p 1 -d
     ${BUILD_DIR}/dpcpp/src/external_dpcpp <
-    ${PATCH_DIR}/dpcpp.diff
+    ${PATCH_DIR}/dpcpp.diff &&
+    ${PATCH_CMD} -p 1 -d
+    ${BUILD_DIR}/dpcpp/src/external_dpcpp <
+    ${PATCH_DIR}/dpcpp_13328.diff
 
   INSTALL_DIR ${LIBDIR}/dpcpp
 )
diff --git a/build_files/build_environment/patches/dpcpp_13328.diff b/build_files/build_environment/patches/dpcpp_13328.diff
new file mode 100644
index 00000000000..2f880818a30
--- /dev/null
+++ b/build_files/build_environment/patches/dpcpp_13328.diff
@@ -0,0 +1,12 @@
+diff --git a/clang/lib/Driver/CMakeLists.txt b/clang/lib/Driver/CMakeLists.txt
+index bfeb4a763da84..94400f08154a2 100644
+--- a/clang/lib/Driver/CMakeLists.txt
++++ b/clang/lib/Driver/CMakeLists.txt
+@@ -98,6 +98,7 @@ add_clang_library(clangDriver
+ 
+   DEPENDS
+   ClangDriverOptions
++  DeviceConfigFile
+ 
+   LINK_LIBS
+   clangBasic