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

Side by Side Diff: build/linux/system.gyp

Issue 244593002: pkg-config-wrapper: use system_libdir for libpath (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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)" "<(system_libdir)"',
10 # libgcrypt-config-wrapper invokes libgcrypt-config directly from the 10 # libgcrypt-config-wrapper invokes libgcrypt-config directly from the
11 # sysroot, so there's no need to prefix it with <(chroot_cmd). 11 # sysroot, so there's no need to prefix it with <(chroot_cmd).
12 'libgcrypt-config': './libgcrypt-config-wrapper "<(sysroot)"', 12 'libgcrypt-config': './libgcrypt-config-wrapper "<(sysroot)"',
13 }, { 13 }, {
14 'pkg-config': 'pkg-config', 14 'pkg-config': 'pkg-config',
15 'libgcrypt-config': 'libgcrypt-config', 15 'libgcrypt-config': 'libgcrypt-config',
16 }], 16 }],
17 ], 17 ],
18 18
19 'linux_link_libgps%': 0, 19 'linux_link_libgps%': 0,
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 ], 1044 ],
1045 'libraries': [ 1045 'libraries': [
1046 '<!@(<(pkg-config) --libs-only-l libudev)', 1046 '<!@(<(pkg-config) --libs-only-l libudev)',
1047 ], 1047 ],
1048 }, 1048 },
1049 }], 1049 }],
1050 ], 1050 ],
1051 }, 1051 },
1052 ], 1052 ],
1053 } 1053 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698