Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(981)

Unified Diff: build/linux/system.gyp

Issue 173309: Revert "linux: call g_thread_init() at relevant startup points" (Closed)
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test_suite.h ('k') | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/system.gyp
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index e10c9053f72d8c3feecd8bdf6dcd9dde7f354914..68b52be0cc1ea385a977b7b9faa5b03b078c4a5b 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': {
« no previous file with comments | « base/test_suite.h ('k') | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698