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

Unified Diff: third_party/sqlite/sqlite.gyp

Issue 10696219: GYP changes to get sql and sqlite building on iOS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Review. Created 8 years, 5 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
« no previous file with comments | « sql/sql.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/sqlite.gyp
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp
index e129046e79c2ea56bedb1b97cfc151de3da054c2..63aea03e525fe93bd702283ba9f630c7183e3ddd 100644
--- a/third_party/sqlite/sqlite.gyp
+++ b/third_party/sqlite/sqlite.gyp
@@ -34,42 +34,49 @@
],
},
],
- ['OS=="linux" and not use_system_sqlite', {
- 'link_settings': {
- 'libraries': [
- '-ldl',
- ],
- },
- }],
['OS == "android"', {
'defines': [
'SQLITE_TEMP_STORE=3',
],
}],
- ['os_posix == 1 and OS != "mac" and use_system_sqlite', {
+ ['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)',
- ],
'defines': [
'USE_SYSTEM_SQLITE',
],
},
- '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
+
+ 'conditions': [
+ ['OS == "ios"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/usr/lib/libsqlite3.dylib',
+ ],
+ },
+ }],
+ ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+ '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)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l sqlite3)',
+ ],
+ },
+ }],
+ ],
+ }, { # !use_system_sqlite
'product_name': 'sqlite3',
'type': 'static_library',
'sources': [
@@ -114,6 +121,13 @@
4018, 4244,
],
'conditions': [
+ ['OS=="linux"', {
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+ }],
['os_posix == 1 and OS != "mac"', {
'cflags': [
# SQLite doesn't believe in compiler warnings,
@@ -143,7 +157,7 @@
},
],
'conditions': [
- ['os_posix == 1 and OS != "mac" and not use_system_sqlite', {
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and not use_system_sqlite', {
'targets': [
{
'target_name': 'sqlite_shell',
« no previous file with comments | « sql/sql.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698