commit 142bddf7dabe2cbbbb2adfaaf0a9708aad0ba1a8
author Austin Eng <enga@chromium.org> Tue Mar 07 09:27:45 2023 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 07 09:27:45 2023 +0000
tree 26d39b4a1a3c55c8641738751477ba1ce0ce3c05
parent 67e7c9fec08b884fa3009c351c88b8fd44a00c68

Fix #ifdefs for spvtools

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

src/tint/cmd/BUILD.gn

diff --git a/src/tint/cmd/BUILD.gn b/src/tint/cmd/BUILD.gn
index e9188cf..b4ff6d5 100644
--- a/src/tint/cmd/BUILD.gn
+++ b/src/tint/cmd/BUILD.gn
@@ -22,7 +22,7 @@
   ]
 
   deps = [ "${tint_root_dir}/src/tint:libtint" ]
-  if (tint_build_spv_writer) {
+  if (tint_build_spv_reader || tint_build_spv_writer) {
     deps += [ "${tint_spirv_tools_dir}/:spvtools_headers" ]
   }
 }

src/tint/fuzzers/tint_common_fuzzer.cc

diff --git a/src/tint/fuzzers/tint_common_fuzzer.cc b/src/tint/fuzzers/tint_common_fuzzer.cc
index c4f1fd1..7c390af 100644
--- a/src/tint/fuzzers/tint_common_fuzzer.cc
+++ b/src/tint/fuzzers/tint_common_fuzzer.cc
@@ -24,9 +24,9 @@
 #include <utility>
 #include <vector>
 
-#if TINT_BUILD_SPV_READER
+#if TINT_BUILD_SPV_READER || TINT_BUILD_SPV_WRITER
 #include "spirv-tools/libspirv.hpp"
-#endif  // TINT_BUILD_SPV_READER
+#endif  // TINT_BUILD_SPV_READER || TINT_BUILD_SPV_WRITER
 
 #include "src/tint/ast/module.h"
 #include "src/tint/diagnostic/formatter.h"