Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(175)

Unified Diff: third_party/zlib/zlib.gyp

Issue 7055003: Last gyp patch for cross-platform Unix support (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« printing/printing.gyp ('K') | « third_party/sqlite/sqlite.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/zlib/zlib.gyp
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index 6fa9e9dccc8e2a7c6daa053edb2af9508c97372f..7718da354e100d3e4a6cf6552f62b8cf7b1487b3 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,
}],
],
« printing/printing.gyp ('K') | « third_party/sqlite/sqlite.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698