commit 1f1f08f94a11f470a4551896df9f610b71876924
author Ryan Harrison <rharrison@chromium.org> Thu May 07 17:17:15 2020 +0000
committer dan sinclair <dsinclair@google.com> Thu May 07 17:17:15 2020 +0000
tree 0d2b457a15c67f7e654f7435b7057eeeeece0669
parent ace7a13662d068e01bbff6e77f985332862f1b7f

Add spvtools deps to top-level targets

Dawn has issues with building tint targets without these specified. Putting them
in public_deps doesn't resolve the linking issue.

Change-Id: Ib99f2d4a74cbb3a33c0aa9e47e5eb788ef01a7e8
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/21280
Reviewed-by: dan sinclair <dsinclair@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index fe75d7b..d2d9b27 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -399,6 +399,7 @@
     ":tint_core_tables_unified1",
     ":tint_language_header_cldebuginfo100",
     ":tint_language_header_debuginfo",
+    "${tint_spirv_tools_dir}/:spvtools",
     "${tint_spirv_tools_dir}/:spvtools_opt",
     "${tint_spirv_tools_dir}/:spvtools_val",
   ]
@@ -883,6 +884,9 @@
     ":gmock_and_gtest",
     ":libtint",
     ":tint_unittests_src",
+    "${tint_spirv_tools_dir}/:spvtools",
+    "${tint_spirv_tools_dir}/:spvtools_opt",
+    "${tint_spirv_tools_dir}/:spvtools_val",
   ]
 
   # TODO(rharrison): Use main() from chromium for chromium tree builds. This
@@ -919,6 +923,9 @@
     deps = [
       ":libtint",
       ":tint_wgsl_reader_fuzzer_src",
+      "${tint_spirv_tools_dir}/:spvtools",
+      "${tint_spirv_tools_dir}/:spvtools_opt",
+      "${tint_spirv_tools_dir}/:spvtools_val",
     ]
   }
 }
@@ -936,7 +943,12 @@
 
 executable("tint_exe") {
   sources = [ "samples/main.cc" ]
-  deps = [ ":libtint" ]
+  deps = [
+    ":libtint",
+    "${tint_spirv_tools_dir}/:spvtools",
+    "${tint_spirv_tools_dir}/:spvtools_opt",
+    "${tint_spirv_tools_dir}/:spvtools_val",
+  ]
 
   if (tint_build_spv_reader || tint_build_spv_writer) {
     deps += [ "${tint_spirv_headers_dir}/:spv_headers" ]