Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1578)

Unified Diff: build/config/linux/pkg_config.gni

Issue 1583093002: GN: Only honour system_libdir for target toolchain (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/pkg_config.gni
diff --git a/build/config/linux/pkg_config.gni b/build/config/linux/pkg_config.gni
index 58769e26958ac066b0ed729a8dae6452739b9728..204cbab1d3be382984e1ac2d32ee40e7ddba3043 100644
--- a/build/config/linux/pkg_config.gni
+++ b/build/config/linux/pkg_config.gni
@@ -55,20 +55,24 @@ if (sysroot != "") {
sysroot,
"-a",
current_cpu,
- "--system_libdir",
- system_libdir,
]
} else if (pkg_config != "") {
pkg_config_args = [
"-p",
pkg_config,
- "--system_libdir",
- system_libdir,
]
} else {
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") {
assert(defined(invoker.packages),
"Variable |packages| must be defined to be a list in pkg_config.")
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698