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

Unified Diff: base/base.gyp

Issue 42340: Update the gyp Linux build: (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 | « DEPS ('k') | build/common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
===================================================================
--- base/base.gyp (revision 12226)
+++ base/base.gyp (working copy)
@@ -319,7 +319,19 @@
# so use idle_timer_none.cc instead.
'idle_timer.cc',
],
- 'cflags': ['-Wno-write-strings'],
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ '../build/linux/system.gyp:nss',
+ ],
+ 'cflags': [
+ '-Wno-write-strings',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ # We need rt for clock_gettime().
+ '-lrt',
+ ],
+ },
},
{ # else: OS != "linux"
'sources!': [
@@ -436,6 +448,11 @@
'base',
],
'conditions': [
+ ['OS == "linux"', {
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
+ }],
[ 'OS != "win"', { 'sources!': [
'gfx/gdi_util.cc',
'gfx/native_theme.cc',
@@ -542,6 +559,9 @@
# if we want it yet, so leave it 'unported' for now.
'idletimer_unittest.cc',
],
+ 'dependencies': [
+ '../build/linux/system.gyp:gtk',
+ ],
}],
['OS != "mac"', {
'sources!': [
@@ -590,6 +610,17 @@
'PERF_TEST',
],
},
+ 'conditions': [
+ ['OS == "linux"', {
+ 'dependencies': [
+ # Needed to handle the #include chain:
+ # base/perf_test_suite.h
+ # base/test_suite.h
+ # gtk/gtk.h
+ '../build/linux/system.gyp:gtk',
+ ],
+ }],
+ ],
},
],
'conditions': [
« no previous file with comments | « DEPS ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698