From c9e28b1463c3e1c014ac12d17b077b8ff4920e70 Mon Sep 17 00:00:00 2001 From: Sean Gilhuly Date: Thu, 23 Apr 2020 16:24:42 +0000 Subject: [PATCH] Use dawn_has_build in dawn_component //build/config/gcc:rpath_for_built_shared_libraries is being pulled in on Skia Linux builds. Don't include it if //build isn't present. Bug: chromium:1072449 Change-Id: I92f2d0ae0b4325ae672a86d6a38caf241929b65b Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/20320 Commit-Queue: Sean Gilhuly Commit-Queue: Corentin Wallez Reviewed-by: Corentin Wallez --- scripts/dawn_component.gni | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/dawn_component.gni b/scripts/dawn_component.gni index 00fad8bb2a..71ba71ef48 100644 --- a/scripts/dawn_component.gni +++ b/scripts/dawn_component.gni @@ -63,7 +63,7 @@ template("dawn_component") { "@executable_path/", ] } - if (is_linux) { + if (is_linux && dawn_has_build) { configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] } } @@ -121,13 +121,9 @@ template("dawn_component") { group(name) { if (is_component_build) { - public_deps = [ - ":${name}_shared", - ] + public_deps = [ ":${name}_shared" ] } else { - public_deps = [ - ":${name}_static", - ] + public_deps = [ ":${name}_static" ] } } }