diff options
author | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 22:27:30 +0000 |
---|---|---|
committer | pvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-14 22:27:30 +0000 |
commit | a13d6771b025aeb6028e7e79c2b80b590c3bac01 (patch) | |
tree | 41556b16c320b2cb737bb9767534e2aa74176284 /third_party/zlib | |
parent | b5284b12bf3c0c3afc1cc0602c4c0569b84b8fca (diff) | |
download | chromium_src-a13d6771b025aeb6028e7e79c2b80b590c3bac01.zip chromium_src-a13d6771b025aeb6028e7e79c2b80b590c3bac01.tar.gz chromium_src-a13d6771b025aeb6028e7e79c2b80b590c3bac01.tar.bz2 |
GYP changes for FreeBSD and OpenBSD
Review URL: http://codereview.chromium.org/1480002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib')
-rw-r--r-- | third_party/zlib/zlib.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp index 36613a7..0f77cb0 100644 --- a/third_party/zlib/zlib.gyp +++ b/third_party/zlib/zlib.gyp @@ -5,10 +5,12 @@ { 'variables': { 'conditions': [ - [ 'OS=="linux"', { + [ 'OS=="linux" or OS=="freebsd"', { # 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" + }, { # OS!="linux" and OS!="freebsd" 'use_system_zlib%': 0, }], ], |