encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <sgilhuly@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Sean Gilhuly 2020-04-23 16:24:42 +00:00 committed by Commit Bot service account
parent 7e972be121
commit c9e28b1463
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/dawn_component.gni
View File

@ -63,7 +63,7 @@ template("dawn_component") {
"@executable_path/", "@executable_path/",
] ]
} }
if (is_linux) { if (is_linux && dawn_has_build) {
configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ] configs = [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
} }
} }
@ -121,13 +121,9 @@ template("dawn_component") {
group(name) { group(name) {
if (is_component_build) { if (is_component_build) {
public_deps = [ public_deps = [ ":${name}_shared" ]
":${name}_shared",
]
} else { } else {
public_deps = [ public_deps = [ ":${name}_static" ]
":${name}_static",
]
} }
} }
} }