diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 16:11:37 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-18 16:11:37 +0000 |
| commit | b5c72b82b5b19a3268ea5df60b79322f7f779027 (patch) | |
| tree | 27bbd22eccca76f350d0e6350e78dcd20f297104 /base/base.gyp | |
| parent | c04057c9f62073cd266eebe462dd777f8fe6d7a5 (diff) | |
| download | chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.zip chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.gz chromium_src-b5c72b82b5b19a3268ea5df60b79322f7f779027.tar.bz2 | |
Solaris: Second set adding in Solaris as an OS option
TEST=compiles
BUG=30101
Patch by James Choi <jchoi42@pha.jhu.edu>.
Review URL: http://codereview.chromium.org/606075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/base/base.gyp b/base/base.gyp index 8e941a3..f4720b4 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -149,7 +149,7 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ - ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'sources!': [ 'file_version_info_unittest.cc', 'worker_pool_linux_unittest.cc', @@ -167,7 +167,7 @@ '../build/linux/system.gyp:nss', '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], - }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" + }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris" 'sources!': [ 'message_pump_glib_unittest.cc', ] @@ -230,7 +230,7 @@ ], }, 'conditions': [ - ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'dependencies': [ # Needed to handle the #include chain: # base/test/perf_test_suite.h @@ -259,7 +259,7 @@ }, ], }], - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { 'targets': [ { 'target_name': 'linux_versioninfo', |