diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/third_party/sqlite | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/third_party/sqlite')
| -rw-r--r-- | chromium/third_party/sqlite/build_as_cpp.cc | 3 | ||||
| -rw-r--r-- | chromium/third_party/sqlite/sqlite.gyp | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/chromium/third_party/sqlite/build_as_cpp.cc b/chromium/third_party/sqlite/build_as_cpp.cc new file mode 100644 index 00000000000..988c0ccc47f --- /dev/null +++ b/chromium/third_party/sqlite/build_as_cpp.cc @@ -0,0 +1,3 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. diff --git a/chromium/third_party/sqlite/sqlite.gyp b/chromium/third_party/sqlite/sqlite.gyp index 984365342bd..30a00fb5642 100644 --- a/chromium/third_party/sqlite/sqlite.gyp +++ b/chromium/third_party/sqlite/sqlite.gyp @@ -127,6 +127,13 @@ ], }, }], + ['OS == "mac" or OS == "ios"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', + ], + }, + }], ['OS == "android"', { 'defines': [ 'HAVE_USLEEP=1', @@ -178,10 +185,9 @@ 'sources': [ 'src/src/shell.c', 'src/src/shell_icu_linux.c', + # Include a dummy c++ file to force linking of libstdc++. + 'build_as_cpp.cc', ], - 'link_settings': { - 'link_languages': ['c++'], - }, }, ], },], |