diff options
| author | sfunkenhauser <sfunkenhauser@google.com> | 2015-01-14 11:56:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-14 19:57:09 +0000 |
| commit | 97a0a6304f0f7fb4f111b034bcf038f0fc95422a (patch) | |
| tree | 9054dc2d00b066799daae371ec4f825137672788 /build/linux | |
| parent | c956a156641baacbf4748330f379d4086681ccd0 (diff) | |
| download | chromium_src-97a0a6304f0f7fb4f111b034bcf038f0fc95422a.zip chromium_src-97a0a6304f0f7fb4f111b034bcf038f0fc95422a.tar.gz chromium_src-97a0a6304f0f7fb4f111b034bcf038f0fc95422a.tar.bz2 | |
Do not depend on or try to configure pangocairo when use_pango == 0
BUG=
Review URL: https://codereview.chromium.org/831453004
Cr-Commit-Position: refs/heads/master@{#311535}
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 09ee713..9079011 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -1110,34 +1110,38 @@ 'type': 'none', 'toolsets': ['host', 'target'], 'conditions': [ - ['_toolset=="target"', { - 'direct_dependent_settings': { - 'cflags': [ - '<!@(<(pkg-config) --cflags pangocairo pangoft2)', - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)', - ], - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)', - ], - }, - }, { - 'direct_dependent_settings': { - 'cflags': [ - '<!@(pkg-config --cflags pangocairo pangoft2)', - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)', - ], - 'libraries': [ - '<!@(pkg-config --libs-only-l pangocairo pangoft2)', - ], - }, + ['use_pango==1 and use_cairo==1', { + 'conditions': [ + ['_toolset=="target"', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags pangocairo pangoft2)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other pangocairo pangoft2)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l pangocairo pangoft2)', + ], + }, + }, { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags pangocairo pangoft2)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other pangocairo pangoft2)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l pangocairo pangoft2)', + ], + }, + }], + ], }], ], }, |