From 1f1f08f94a11f470a4551896df9f610b71876924 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Thu, 7 May 2020 17:17:15 +0000 Subject: [PATCH] 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 --- BUILD.gn | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/BUILD.gn b/BUILD.gn index fe75d7bdfc..d2d9b27d95 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -399,6 +399,7 @@ source_set("libtint_spv_reader_src") { ":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 @@ test("tint_unittests") { ":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 @@ if (build_with_chromium) { 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 @@ config("tint_exe_config") { 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" ]