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

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

Issue 212843007: Update .gn files to use new template syntax. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Now with new shas Created 6 years, 9 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 | build/toolchain/gcc_toolchain.gni » ('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 fdd31ba846bc1a7737fac94cf722df4081429f38..04487ccaaea02bb1176632c0721cefcb1255370b 100644
--- a/build/config/linux/pkg_config.gni
+++ b/build/config/linux/pkg_config.gni
@@ -19,14 +19,14 @@ import("//build/config/sysroot.gni")
# }
template("pkg_config") {
- assert(defined(packages),
+ assert(defined(invoker.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
+ args = ["-s", sysroot, "-a", cpu_arch] + invoker.packages
} else {
- args = packages
+ args = invoker.packages
}
pkgresult = exec_script("//build/config/linux/pkg-config.py",
args, "value")
@@ -35,5 +35,9 @@ template("pkg_config") {
libs = pkgresult[2]
lib_dirs = pkgresult[3]
ldflags = pkgresult[4]
+
+ if (defined(invoker.defines)) {
+ defines = invoker.defines
+ }
}
}
« no previous file with comments | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698