diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 21:40:43 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-05 21:40:43 +0000 |
| commit | 987c57980c6edf814fb172f4aab8bb8ea080ecac (patch) | |
| tree | 7c86a54f44e28cca353def6f3365f590200bde67 /build | |
| parent | 7f8d70ea6f2ad3fd5dafc079d519389f96263e25 (diff) | |
| download | chromium_src-987c57980c6edf814fb172f4aab8bb8ea080ecac.zip chromium_src-987c57980c6edf814fb172f4aab8bb8ea080ecac.tar.gz chromium_src-987c57980c6edf814fb172f4aab8bb8ea080ecac.tar.bz2 | |
Fix build with harfbuzz-0.9.18
See https://bugs.gentoo.org/show_bug.cgi?id=472416 .
BUG=none
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/16172008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/unbundle/harfbuzz.gyp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/build/linux/unbundle/harfbuzz.gyp b/build/linux/unbundle/harfbuzz.gyp index 456dd38..93b2a69 100644 --- a/build/linux/unbundle/harfbuzz.gyp +++ b/build/linux/unbundle/harfbuzz.gyp @@ -3,24 +3,34 @@ # found in the LICENSE file. { + 'variables': { + # Check for presence of harfbuzz-icu library, use it if present. + 'harfbuzz_libraries': + '<!(python <(DEPTH)/tools/compile_test/compile_test.py ' + '--code "int main() { return 0; }" ' + '--run-linker ' + '--on-success "harfbuzz harfbuzz-icu" ' + '--on-failure "harfbuzz" ' + '-- -lharfbuzz-icu)', + }, 'targets': [ { 'target_name': 'harfbuzz-ng', 'type': 'none', 'cflags': [ - '<!@(pkg-config --cflags harfbuzz)', + '<!@(pkg-config --cflags <(harfbuzz_libraries))', ], 'direct_dependent_settings': { 'cflags': [ - '<!@(pkg-config --cflags harfbuzz)', + '<!@(pkg-config --cflags <(harfbuzz_libraries))', ], }, 'link_settings': { 'ldflags': [ - '<!@(pkg-config --libs-only-L --libs-only-other harfbuzz)', + '<!@(pkg-config --libs-only-L --libs-only-other <(harfbuzz_libraries))', ], 'libraries': [ - '<!@(pkg-config --libs-only-l harfbuzz)', + '<!@(pkg-config --libs-only-l <(harfbuzz_libraries))', ], }, }, |