diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 22:04:36 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-18 22:04:36 +0000 |
| commit | 75c60c1aa64a03889641bfc0fdbace7f440097b9 (patch) | |
| tree | 5fbdd5d4ae06b0932a54c6f0d378d04796435b5f /third_party | |
| parent | 420ab64e98cc447cc36790c50f8662290bc41dcb (diff) | |
| download | chromium_src-75c60c1aa64a03889641bfc0fdbace7f440097b9.zip chromium_src-75c60c1aa64a03889641bfc0fdbace7f440097b9.tar.gz chromium_src-75c60c1aa64a03889641bfc0fdbace7f440097b9.tar.bz2 | |
Don't pass --atleast-version to pkg-config.
Turns out that pkgconfig produces no output if --atleast-version is
given. Thus we list the cflags twice, once to catch the version error
and then a second time to get the flags we need.
(Reported by fta.)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/sqlite/sqlite.gyp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/third_party/sqlite/sqlite.gyp b/third_party/sqlite/sqlite.gyp index 4a4d869..62733df 100644 --- a/third_party/sqlite/sqlite.gyp +++ b/third_party/sqlite/sqlite.gyp @@ -28,20 +28,23 @@ 'type': 'settings', 'direct_dependent_settings': { 'cflags': [ - '<!@(pkg-config --cflags --atleast-version=<(required_sqlite_version) sqlite3)', + # 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 --atleast-version=<(required_sqlite_version) --libs-only-L --libs-only-other sqlite3)', + '<!@(pkg-config --libs-only-L --libs-only-other sqlite3)', ], 'libraries': [ - '<!@(pkg-config --atleast-version=<(required_sqlite_version) --libs-only-l sqlite3)', + '<!@(pkg-config --libs-only-l sqlite3)', ], }, }, { # else: OS != "linux" or ! use_system_sqlite |