diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-23 23:58:00 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-23 23:58:00 +0000 |
| commit | a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e (patch) | |
| tree | 297c4aa3c00586ddd894ed320b667d8a17d565ab /webkit | |
| parent | a07cbae73ef54a6c5c8877cffd3e80a581ea7d8d (diff) | |
| download | chromium_src-a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e.zip chromium_src-a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e.tar.gz chromium_src-a7791cf2c1c1f565c43a8cb0e337ea0b7ab72b9e.tar.bz2 | |
Multiple fixes for broken Linux SHARED=1 build. This gets things building, but the resulting 'chrome' binary crashes on start-up (test_shell seems to work better).
Review URL: http://codereview.chromium.org/27054
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/WebCore/SConscript | 6 | ||||
| -rw-r--r-- | webkit/glue/SConscript | 9 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 0db8ffd..c9704c3 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -33,7 +33,11 @@ if env.Bit('posix'): env.Append( CPPPATH = [ '$THIRD_PARTY_DIR/sqlite/preprocessed' - ] + ], + LIBS = [ + 'V8Bindings', + 'JavaScriptCore_pcre', + ], ) input_files = [ diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index ba4c351..3d9b3e6 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -9,7 +9,14 @@ env = env.Clone() env.Append( CPPPATH = [ '$WEBKIT_DIR/build/WebCore', - ] + ], + LIBS = [ + 'port', + 'renderer', + 'V8Bindings', + 'WebCore', + 'WTF', + ], ) if env.Bit('windows'): diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 24d1af3..382484b 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -30,6 +30,7 @@ env.Append( 'port', 'base', 'base_gfx', + 'browser', 'googleurl', 'net', 'sdch', |