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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « build/linux/libgcrypt-config-wrapper ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)"',
10 'libgcrypt-config': '<(chroot_cmd) ./libgcrypt-config-wrapper "<(sysroot )"',
10 }, { 11 }, {
11 'pkg-config': 'pkg-config' 12 'pkg-config': 'pkg-config',
13 'libgcrypt-config': 'libgcrypt-config',
12 }], 14 }],
13 ], 15 ],
14 16
15 'linux_link_libgps%': 0, 17 'linux_link_libgps%': 0,
16 'linux_link_libpci%': 0, 18 'linux_link_libpci%': 0,
17 'linux_link_libspeechd%': 0, 19 'linux_link_libspeechd%': 0,
18 'linux_link_libbrlapi%': 0, 20 'linux_link_libbrlapi%': 0,
19 }, 21 },
20 'conditions': [ 22 'conditions': [
21 [ 'chromeos==0', { 23 [ 'chromeos==0', {
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 ], 731 ],
730 }, 732 },
731 }, 733 },
732 { 734 {
733 'target_name': 'libgcrypt', 735 'target_name': 'libgcrypt',
734 'type': 'none', 736 'type': 'none',
735 'conditions': [ 737 'conditions': [
736 ['_toolset=="target" and use_cups==1', { 738 ['_toolset=="target" and use_cups==1', {
737 'direct_dependent_settings': { 739 'direct_dependent_settings': {
738 'cflags': [ 740 'cflags': [
739 '<!@(libgcrypt-config --cflags)', 741 '<!@(<(libgcrypt-config) --cflags)',
740 ], 742 ],
741 }, 743 },
742 'link_settings': { 744 'link_settings': {
743 'libraries': [ 745 'libraries': [
744 '<!@(libgcrypt-config --libs)', 746 '<!@(<(libgcrypt-config) --libs)',
745 ], 747 ],
746 }, 748 },
747 }], 749 }],
748 ], 750 ],
749 }, 751 },
750 { 752 {
751 'target_name': 'libpci', 753 'target_name': 'libpci',
752 'type': 'static_library', 754 'type': 'static_library',
753 'cflags': [ 755 'cflags': [
754 '<!@(<(pkg-config) --cflags libpci)', 756 '<!@(<(pkg-config) --cflags libpci)',
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
999 ], 1001 ],
1000 'libraries': [ 1002 'libraries': [
1001 '<!@(<(pkg-config) --libs-only-l libudev)', 1003 '<!@(<(pkg-config) --libs-only-l libudev)',
1002 ], 1004 ],
1003 }, 1005 },
1004 }], 1006 }],
1005 ], 1007 ],
1006 }, 1008 },
1007 ], 1009 ],
1008 } 1010 }
OLDNEW
« 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