Commit d4566597 authored by sbc's avatar sbc Committed by Commit bot

GN: Only honour system_libdir for target toolchain

Without this change when system_libdir is set (e.g.
to lib64) it would apply this to all toolchains
including the host toolchain.

Review URL: https://codereview.chromium.org/1583093002

Cr-Commit-Position: refs/heads/master@{#371875}
parent 7eb75280
...@@ -55,20 +55,24 @@ if (sysroot != "") { ...@@ -55,20 +55,24 @@ if (sysroot != "") {
sysroot, sysroot,
"-a", "-a",
current_cpu, current_cpu,
"--system_libdir",
system_libdir,
] ]
} else if (pkg_config != "") { } else if (pkg_config != "") {
pkg_config_args = [ pkg_config_args = [
"-p", "-p",
pkg_config, pkg_config,
"--system_libdir",
system_libdir,
] ]
} else { } else {
pkg_config_args = [] pkg_config_args = []
} }
# Only use the custom libdir when building with the default toolchain.
if (current_toolchain == default_toolchain) {
pkg_config_args += [
"--system_libdir",
system_libdir,
]
}
template("pkg_config") { template("pkg_config") {
assert(defined(invoker.packages), assert(defined(invoker.packages),
"Variable |packages| must be defined to be a list in pkg_config.") "Variable |packages| must be defined to be a list in pkg_config.")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment