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

Unified Diff: third_party/bzip2/bzip2.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
Index: third_party/bzip2/bzip2.gyp
diff --git a/third_party/bzip2/bzip2.gyp b/third_party/bzip2/bzip2.gyp
index b1548f957371de122cd4434f4d6a4bc96f89d7ff..ae31121de93dc99e9655dfc0970d119147ee18d0 100644
--- a/third_party/bzip2/bzip2.gyp
+++ b/third_party/bzip2/bzip2.gyp
@@ -5,10 +5,10 @@
{
'variables': {
'conditions': [
- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ [ 'os_posix == 1 and OS != "mac"', {
# Link to system .so since we already use it due to GTK.
'use_system_bzip2%': 1,
- }, { # OS!="linux"
+ }, { # os_posix != 1 or OS == "mac"
'use_system_bzip2%': 0,
}],
],
« printing/printing.gyp ('K') | « testing/gtest.gyp ('k') | third_party/expat/expat.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698