commit 7c391e87eb117eebd30d1941c4c258dff3254d20
author Ben Clayton <bclayton@google.com> Mon Dec 04 18:14:25 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Dec 04 18:14:25 2023 +0000
tree f02f47f3245dc4c4a1f4304d997366858a7728d5
parent ac0216bad7571c972ea2a592310beb36aa1f299a

[third_party][dxc] Remove include directory to llvm_assert

`third_party/dxc/lib/Support/assert.cpp` was including `<assert.h>`, and because of this include directory, it was picking up DXC's assert.h instead of the system header.

This caused `llvm_assert()` to call itself until the stack was blown.

Change-Id: I943b53c48bd1e5ae350555161691397be12daaac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/163882
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Ben Clayton <bclayton@google.com>

third_party/gn/dxc/BUILD.gn

diff --git a/third_party/gn/dxc/BUILD.gn b/third_party/gn/dxc/BUILD.gn
index b1a60bb..b3c7636 100644
--- a/third_party/gn/dxc/BUILD.gn
+++ b/third_party/gn/dxc/BUILD.gn
@@ -548,10 +548,18 @@
     "$dawn_dxc_dir/include",
     "$dawn_dxc_dir/tools/clang/include",
     "$dawn_dxc_dir/tools/clang/tools",
-    "$dawn_dxc_dir/include/llvm/llvm_assert",
     "${target_gen_dir}/include",  # Generated files
   ]
 
+  if (is_win) {
+    include_dirs += [
+      # $dawn_dxc_dir/lib/Support/assert.cpp depends on a "assert.h" include for the windows path,
+      # but the other architectures include <assert.h>. The system include would be shadowed if this
+      # include directory is added.
+      "$dawn_dxc_dir/include/llvm/llvm_assert",
+    ]
+  }
+
   defines = []
   if (is_debug && dawn_dxc_disable_asserts_debug) {
     defines += [ "NDEBUG" ]