diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-23 22:06:54 +0000 |
| commit | 6a654d45598c2631f0009101a553fd14b866b62f (patch) | |
| tree | afd71c88f45b680bf30040047075fe259d5c767c /third_party/zlib | |
| parent | fcc2d5f0e4ff841a6af7cc7f5834985f833cf935 (diff) | |
| download | chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.zip chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.gz chromium_src-6a654d45598c2631f0009101a553fd14b866b62f.tar.bz2 | |
Final gyp patch to make use of the new cross-platform POSIX defines toolkit_uses_gtk, os_posix, and use_x11. For lists of source files that use a mix of POSIX and Gtk APIs, toolkit_uses_gtk was given precedence. Solaris was made to use ALSA also, as libasound has been ported to FreeBSD and Solaris as a wrapper around the native OSS.
Review URL: http://codereview.chromium.org/7055003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
| -rw-r--r-- | third_party/zlib/zlib.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 6fa9e9d..7718da3 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -5,12 +5,12 @@ { 'variables': { 'conditions': [ - [ 'OS=="linux" or OS=="freebsd"', { + [ 'os_posix == 1 and OS != "mac" and OS != "openbsd"', { # Link to system .so since we already use it due to GTK. # TODO(pvalchev): OpenBSD is purposefully left out, as the system # zlib brings up an incompatibility that breaks rendering. 'use_system_zlib%': 1, - }, { # OS!="linux" and OS!="freebsd" + }, { # os_posix != 1 or OS == "mac" or OS == "openbsd" 'use_system_zlib%': 0, }], ], |