diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 07:14:01 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 07:14:01 +0000 |
| commit | bf9e07ed58fcdf285376a0583de21caecdb7e52e (patch) | |
| tree | 2cfb1593ebd0afb18a5e7791bbb3d98fb282d99a /build | |
| parent | c870c76357fc05d3f7181f8121181f983bd25e7f (diff) | |
| download | chromium_src-bf9e07ed58fcdf285376a0583de21caecdb7e52e.zip chromium_src-bf9e07ed58fcdf285376a0583de21caecdb7e52e.tar.gz chromium_src-bf9e07ed58fcdf285376a0583de21caecdb7e52e.tar.bz2 | |
Add sqlite to list of things to build.
Follow up to issue 19041/r8767. Building with SHARED=1 --mode=opt got errors with missing sqlite. Move sqlite append from chrome/SConscript to build/SConscript.main.
Review URL: http://codereview.chromium.org/19615
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8798 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index d6df2c3..7b88e57 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -225,6 +225,8 @@ sconscripts = root_env.ChromiumLoadComponentSConscripts( # Add the final list into the root environment to be build in BuildComponents. root_env.Append(BUILD_SCONSCRIPTS = sconscripts) +if not root_env.WantSystemLib('sqlite'): + root_env.Append(BUILD_SCONSCRIPTS = ['$SQLITE_DIR/SConscript']) # -------------------------------------------------------------------------- @@ -564,6 +566,8 @@ if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: '#Software_Requirements') sys.exit(1) + + # TODO: Factor the code here into aits own function. if root_env.WantSystemLib('libxml'): try: linux_env.ParseConfig('pkg-config --cflags --libs libxml-2.0') @@ -578,6 +582,13 @@ if root_env['PLATFORM'] in ['linux', 'linux2', 'posix']: print ('\n' 'libxslt requested in SYSTEM_LIBS but not found\n') sys.exit(1) + if root_env.WantSystemLib('sqlite'): + try: + linux_env.ParseConfig('pkg-config --cflags --libs sqlite') + except OSError, e: + print ('\n' + 'sqlite requested in SYSTEM_LIBS but not found\n') + sys.exit(1) linux_dbg = linux_env.Clone() environment_list.append(linux_dbg) |