Index: third_party/sqlite/sqlite.gyp |
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp |
index 6c4316b195e449749fcf45ac08f0da2d7268a8d8..e959d79ee0446ffe0fa5bfe81341d7bede22de98 100644 |
--- a/third_party/sqlite/sqlite.gyp |
+++ b/third_party/sqlite/sqlite.gyp |
@@ -43,27 +43,43 @@ |
}], |
['os_posix == 1 and OS != "mac" and use_system_sqlite', { |
'type': 'none', |
- 'direct_dependent_settings': { |
- 'cflags': [ |
- # This next command produces no output but it it will fail (and |
- # cause GYP to fail) if we don't have a recent enough version of |
- # sqlite. |
- '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlite3)', |
- '<!@(pkg-config --cflags sqlite3)', |
- ], |
+ 'direct_dependent_settings': { |
'defines': [ |
'USE_SYSTEM_SQLITE', |
], |
- }, |
- 'link_settings': { |
- 'ldflags': [ |
- '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)', |
- ], |
- 'libraries': [ |
- '<!@(pkg-config --libs-only-l sqlite3)', |
+ 'conditions': [ |
+ ['OS != "ios"', { |
+ 'cflags': [ |
+ # This next command produces no output but it it will fail |
+ # (and cause GYP to fail) if we don't have a recent enough |
+ # version of sqlite. |
+ '<!@(pkg-config --atleast-version=<(required_sqlite_version) sqlite3)', |
+ '<!@(pkg-config --cflags sqlite3)', |
+ ], |
+ }], |
], |
}, |
+ |
+ |
+ 'conditions': [ |
+ ['OS == "ios"', { |
+ 'link_settings': { |
+ 'libraries': [ |
+ '$(SDKROOT)/usr/lib/libsqlite3.dylib', |
+ ], |
+ }, |
+ },{ # OS != ios |
+ 'link_settings': { |
+ 'ldflags': [ |
+ '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)', |
+ ], |
+ 'libraries': [ |
+ '<!@(pkg-config --libs-only-l sqlite3)', |
+ ], |
+ }, |
+ }], |
+ ], |
}, { # else: os_posix == 1 or OS == "mac" or ! use_system_sqlite |
stuartmorgan
2012/07/13 12:18:10
As long as you are here, s/1/0/ so this comment st
|
'product_name': 'sqlite3', |
'type': 'static_library', |