| Index: build/linux/system.gyp
|
| diff --git a/build/linux/system.gyp b/build/linux/system.gyp
|
| index 09ee713634dec18e4cb2b8d842b66d7715ce6d81..9079011122c4f8948cb4db49e790976a52b7649f 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)',
|
| + ],
|
| + },
|
| + }],
|
| + ],
|
| }],
|
| ],
|
| },
|
|
|