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

Unified Diff: third_party/sqlite/sqlite.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/sqlite/sqlite.gyp
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index 1ce43461bcf414ecbc525972bc0e2b82654760da..93d8ede3beb8de40857159aeea5cdcfe10d20e68 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -41,7 +41,7 @@
],
},
}],
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_sqlite', {
+ ['os_posix == 1 and OS != "mac" and use_system_sqlite', {
'type': 'settings',
'direct_dependent_settings': {
'cflags': [
@@ -64,7 +64,7 @@
'<!@(pkg-config --libs-only-l sqlite3)',
],
},
- }, { # else: OS != "linux" or ! use_system_sqlite
+ }, { # else: os_posix == 1 or OS == "mac" or ! use_system_sqlite
'product_name': 'sqlite3',
'type': 'static_library',
'msvs_guid': '6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9',
@@ -110,7 +110,7 @@
4018, 4244,
],
'conditions': [
- ['OS=="linux"', {
+ ['os_posix == 1 and OS != "mac"', {
'cflags': [
# SQLite doesn't believe in compiler warnings,
# preferring testing.
@@ -125,7 +125,7 @@
},
],
'conditions': [
- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and not use_system_sqlite', {
+ ['os_posix == 1 and OS != "mac" and not use_system_sqlite', {
'targets': [
{
'target_name': 'sqlite_shell',

Powered by Google App Engine
This is Rietveld 408576698