commit 8e9cf72abb35507c6e1d0964a99dd02310fef6e5
author Hans Wennborg <hans@chromium.org> Fri Nov 03 20:21:43 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Nov 03 20:21:43 2023 +0000
tree 6a27aa647dd3072088fa0c0e051859ba439fe257
parent 4315c6a3ea2dc75de93f1e59f9898d8731094d2e

Drop /Zc:twoPhase- flag from DXC build with clang-cl

It's only needed when building with MSVC, and clang-cl is deprecating
the flag.

Bug: chromium:1495100
Change-Id: I3da6e93faa07b39b5c45121968e487e0615f31c8
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/158241
Auto-Submit: Hans Wennborg <hwennborg@google.com>
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Austin Eng <enga@chromium.org>

third_party/gn/dxc/BUILD.gn

diff --git a/third_party/gn/dxc/BUILD.gn b/third_party/gn/dxc/BUILD.gn
index 5909ce7..95a090d 100644
--- a/third_party/gn/dxc/BUILD.gn
+++ b/third_party/gn/dxc/BUILD.gn
@@ -521,10 +521,14 @@
     cflags_cc += [
       "/EHsc",  # DXC uses exceptions
       "/Zc:__cplusplus",
-      "/Zc:twoPhase-",  # DXC source relies on MSVC's non-conforming
-                        # two-phase lookup
       "/Zc:sizedDealloc-",  # Disable sized allocation
     ]
+    if (!is_clang) {
+      cflags_cc += [
+        "/Zc:twoPhase-",  # DXC source relies on MSVC's non-conforming
+                          # two-phase lookup
+      ]
+    }
 
     cflags_c += [
       "/EHsc",  # DXC uses exceptions