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

Unified Diff: build/linux/system.gyp

Issue 204553003: linux: use correct libgcrypt-config paths when cross-compiling (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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 | « build/linux/libgcrypt-config-wrapper ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 7911ae9b4d763fd5f7b5cf71369c586c5fc823fc..92db5ff79dd1a9ca6b249f9fcc3ae356a7092e25 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -7,8 +7,10 @@
'conditions': [
['sysroot!=""', {
'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
+ 'libgcrypt-config': '<(chroot_cmd) ./libgcrypt-config-wrapper "<(sysroot)"',
}, {
- 'pkg-config': 'pkg-config'
+ 'pkg-config': 'pkg-config',
+ 'libgcrypt-config': 'libgcrypt-config',
}],
],
@@ -736,12 +738,12 @@
['_toolset=="target" and use_cups==1', {
'direct_dependent_settings': {
'cflags': [
- '<!@(libgcrypt-config --cflags)',
+ '<!@(<(libgcrypt-config) --cflags)',
],
},
'link_settings': {
'libraries': [
- '<!@(libgcrypt-config --libs)',
+ '<!@(<(libgcrypt-config) --libs)',
],
},
}],
« no previous file with comments | « build/linux/libgcrypt-config-wrapper ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698