diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 01:14:36 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 01:14:36 +0000 |
| commit | ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc (patch) | |
| tree | 01bce3d6d6590b967146b011c50b5763defc7ae6 /build/linux | |
| parent | d07f31723cd037a8c6bef60b234fdb4ad746f34a (diff) | |
| download | chromium_src-ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc.zip chromium_src-ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc.tar.gz chromium_src-ce4f3bda0b09ed2cfd4773d493aeb432428a4cfc.tar.bz2 | |
Revert "linux: call g_thread_init() at relevant startup points"
This reverts commit r24203, Mac breakage.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/linux')
| -rw-r--r-- | build/linux/system.gyp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/build/linux/system.gyp b/build/linux/system.gyp index e10c905..68b52be 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -9,15 +9,15 @@ 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ - '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)', + '<!@(pkg-config --cflags gtk+-2.0)', ], }, 'link_settings': { 'ldflags': [ - '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)', + '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0)', ], 'libraries': [ - '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)', + '<!@(pkg-config --libs-only-l gtk+-2.0)', ], }, }, @@ -107,6 +107,23 @@ }, }, { + 'target_name': 'gthread', + 'type': 'settings', + 'direct_dependent_settings': { + 'cflags': [ + '<!@(pkg-config --cflags gthread-2.0)', + ], + }, + 'link_settings': { + 'ldflags': [ + '<!@(pkg-config --libs-only-L --libs-only-other gthread-2.0)', + ], + 'libraries': [ + '<!@(pkg-config --libs-only-l gthread-2.0)', + ], + }, + }, + { 'target_name': 'x11', 'type': 'settings', 'direct_dependent_settings': { |