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

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

Issue 116803003: Add support for sysroots to GN's pkg-config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « build/config/linux/pkg-config.py ('k') | build/config/linux/sysroot_ld_path.py » ('j') | 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 50e21f1d009609d14ae8283da21a81b5c860f867..3c26d52b17795450ec0617a703f0f084faca5360 100644
--- a/build/config/linux/pkg_config.gni
+++ b/build/config/linux/pkg_config.gni
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("sysroot.gni")
+
# Defines a config specifying the result of running pkg-config for the given
# packages. Put the package names you want to query in the "packages" variable
# inside the template invocation.
@@ -20,8 +22,14 @@ template("pkg_config") {
assert(defined(packages),
"Variable |packages| must be defined to be a list in pkg_config.")
config(target_name) {
+ if (sysroot != "") {
+ # Pass the sysroot if we're using one (it requires the CPU arch also).
+ args = ["-s", sysroot, "-a", cpu_arch] + packages
+ } else {
+ args = packages
+ }
pkgresult = exec_script("//build/config/linux/pkg-config.py",
- packages, "value")
+ args, "value")
include_dirs = pkgresult[0]
cflags = pkgresult[1]
libs = pkgresult[2]
« no previous file with comments | « build/config/linux/pkg-config.py ('k') | build/config/linux/sysroot_ld_path.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698