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

Unified Diff: printing/BUILD.gn

Issue 1526033002: printing: Invoke cups-config from the sysroot if one is being used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | printing/printing.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/BUILD.gn
diff --git a/printing/BUILD.gn b/printing/BUILD.gn
index d8255be842de4e725a7145c28b9b333d23e8c082..45dfcc8e9399247f124ff09062ef51fe1a6a58d6 100644
--- a/printing/BUILD.gn
+++ b/printing/BUILD.gn
@@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/config/features.gni")
+import("//build/config/sysroot.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
if (is_mac) {
@@ -128,7 +129,10 @@ component("printing") {
if (is_linux) {
cups_version = exec_script("cups_config_helper.py",
- [ "--api-version" ],
+ [
+ "--api-version",
+ sysroot,
+ ],
"trim string")
if (cups_version == "1.6" || cups_version == "1.7") {
@@ -247,7 +251,12 @@ if (use_cups) {
libs = [ "cups" ]
lib_dirs = [ "$mac_sdk_path/usr/lib" ]
} else {
- libs = exec_script("cups_config_helper.py", [ "--libs-for-gn" ], "value")
+ libs = exec_script("cups_config_helper.py",
+ [
+ "--libs-for-gn",
+ sysroot,
+ ],
+ "value")
}
}
}
« no previous file with comments | « no previous file | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698