diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 00:17:19 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 00:17:19 +0000 |
| commit | 258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9 (patch) | |
| tree | ae909a1785ad6845f22ec1703fe1cf27d9f41448 /build/linux/system.gyp | |
| parent | bf1734063e3091984b53bb3baadcae42a976b0a6 (diff) | |
| download | chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.zip chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.tar.gz chromium_src-258dca4ef35f63a8fa5ba0f0daf7d108cd1a66d9.tar.bz2 | |
Reland 102005 and 102009: aura: Explicitly disable GTK.
Explicitly disable GTK by setting TOOLKIT_USES_GTK. This is the first in a
series of changes required to have chrome on aura build and link without GTK.
This CL makes base/ build without GTK. Subsequent CLs will do this for other
components.
TBR=evan@chromium.org
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/7983022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux/system.gyp')
| -rw-r--r-- | build/linux/system.gyp | 50 |
1 files changed, 37 insertions, 13 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 7578552..688903f 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -468,19 +468,43 @@ { 'target_name': 'glib', 'type': 'settings', - 'direct_dependent_settings': { - 'cflags': [ - '<!@(<(pkg-config) --cflags glib-2.0)', - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)', - ], - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l glib-2.0)', - ], - }, + 'toolsets': ['host', 'target'], + 'conditions': [ + ['_toolset=="target"', { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(<(pkg-config) --cflags glib-2.0)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(<(pkg-config) --libs-only-L --libs-only-other glib-2.0)', + ], + 'libraries': [ + '<!@(<(pkg-config) --libs-only-l glib-2.0)', + ], + }, + }, { + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags glib-2.0)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other glib-2.0)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l glib-2.0)', + ], + }, + }], + ['chromeos==1', { + 'link_settings': { + 'libraries': [ '-lXtst' ] + } + }], + ], }, { 'target_name': 'libresolv', |