diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:05:21 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:05:21 +0000 |
| commit | 6f020e99420b83918f752e7df9302e659630e0f9 (patch) | |
| tree | 6d6d7be21471f316eaecc100ca90eafa26cf94d5 /third_party/libpng/libpng.gyp | |
| parent | 8533da5619ef980f299787ec1e643fc0631532ee (diff) | |
| download | chromium_src-6f020e99420b83918f752e7df9302e659630e0f9.zip chromium_src-6f020e99420b83918f752e7df9302e659630e0f9.tar.gz chromium_src-6f020e99420b83918f752e7df9302e659630e0f9.tar.bz2 | |
arm: fix pkgconfig for libpng when cross-compiling
Review URL: http://codereview.chromium.org/486039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34394 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libpng/libpng.gyp')
| -rw-r--r-- | third_party/libpng/libpng.gyp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/third_party/libpng/libpng.gyp b/third_party/libpng/libpng.gyp index 1387b18..d29d8c1 100644 --- a/third_party/libpng/libpng.gyp +++ b/third_party/libpng/libpng.gyp @@ -67,6 +67,17 @@ }, ] }, { + 'conditions': [ + ['sysroot!=""', { + 'variables': { + 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)"', + }, + }, { + 'variables': { + 'pkg-config': 'pkg-config' + }, + }], + ], 'targets': [ { 'target_name': 'libpng', @@ -76,7 +87,7 @@ ], 'direct_dependent_settings': { 'cflags': [ - '<!@(pkg-config --cflags libpng)', + '<!@(<(pkg-config) --cflags libpng)', ], 'defines': [ 'USE_SYSTEM_LIBPNG', @@ -84,10 +95,10 @@ }, 'link_settings': { 'ldflags': [ - '<!@(pkg-config --libs-only-L --libs-only-other libpng)', + '<!@(<(pkg-config) --libs-only-L --libs-only-other libpng)', ], 'libraries': [ - '<!@(pkg-config --libs-only-l libpng)', + '<!@(<(pkg-config) --libs-only-l libpng)', ], }, }, |