summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 03:07:58 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-09 03:07:58 +0000
commite001408db4f1a0107c5ca214610ff07db3e74f0e (patch)
tree2c75836df14fe6e8257f2117d1ee15f0516ab46a /base
parent3fa2003b54938d473e683464c28111e21148f426 (diff)
downloadchromium_src-e001408db4f1a0107c5ca214610ff07db3e74f0e.zip
chromium_src-e001408db4f1a0107c5ca214610ff07db3e74f0e.tar.gz
chromium_src-e001408db4f1a0107c5ca214610ff07db3e74f0e.tar.bz2
Define USE_SYMBOLIZE for Solaris because we build the 'symbolize' target
on Solaris. This allows us to merge two conditionals. R=evan,mark BUG=none TEST=no build errors on any platform. Review URL: http://codereview.chromium.org/2924002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/base.gypi8
1 files changed, 2 insertions, 6 deletions
diff --git a/base/base.gypi b/base/base.gypi
index 6d9ce63..d590df0 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -451,7 +451,7 @@
'version.h',
],
'conditions': [
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
'conditions': [
[ 'chromeos==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ]
@@ -464,11 +464,7 @@
'cflags': [
'-Wno-write-strings',
],
- },],
- # TODO(wtc): can this become the 'else' clause of the conditional
- # above? Can we define USE_SYMBOLIZE and use -Wno-write-strings on
- # Solaris?
- [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
+ }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"
'sources/': [
['exclude', '/xdg_user_dirs/'],
['exclude', '_nss\.cc$'],