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 /webkit/webkit.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 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 483c1a6..4c1f9a1 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -391,7 +391,7 @@ # own hard dependencies. 'hard_dependency': 1, 'conditions': [ - ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { + ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { 'dependencies': [ '../build/linux/system.gyp:gtk', '../base/base.gyp:linux_versioninfo', @@ -399,7 +399,8 @@ 'sources!': [ 'glue/plugins/plugin_stubs.cc', ], - }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" + }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \ + # and OS!="solaris"' 'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'], ['exclude', r'/gtk_']], }], |