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 /chrome | |
| 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 'chrome')
| -rw-r--r-- | chrome/browser/browser.scons | 7 | ||||
| -rw-r--r-- | chrome/browser/debugger/debugger.scons | 1 | ||||
| -rw-r--r-- | chrome/renderer/renderer.scons | 6 | ||||
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 5 | ||||
| -rw-r--r-- | chrome/third_party/hunspell/SConscript | 16 | ||||
| -rw-r--r-- | chrome/tools/convert_dict/convert_dict.scons | 5 |
6 files changed, 34 insertions, 6 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index 9af4565..c4011b1 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -21,6 +21,13 @@ env.SConscript([ '$ZLIB_DIR/using_zlib.scons', ], {'env':env}) +env.Append( + LIBS = [ + 'debugger', + 'glue', + ], +) + env.Prepend( CPPPATH = [ '$CHROME_DIR/app', diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons index 30d1a65..11907f24 100644 --- a/chrome/browser/debugger/debugger.scons +++ b/chrome/browser/debugger/debugger.scons @@ -9,6 +9,7 @@ env = env.Clone() env.SConscript([ '$BREAKPAD_DIR/using_breakpad.scons', '$CHROME_DIR/third_party/wtl/using_wtl.scons', + '$CHROME_SRC_DIR/build/using_v8.scons', '$GRIT_DIR/build/using_generated_resources.scons', '$ICU38_DIR/using_icu38.scons', '$LIBPNG_DIR/using_libpng.scons', diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons index 4f5ba60..c03848b 100644 --- a/chrome/renderer/renderer.scons +++ b/chrome/renderer/renderer.scons @@ -21,6 +21,12 @@ env.Prepend( ], ) +env.Append( + LIBS = [ + 'common', + ], +) + if env.Bit('windows'): env.Prepend( CPPPATH = [ diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index e02dd66..74bb036 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -3,6 +3,7 @@ # found in the LICENSE file. Import('env') +Import('bdict_reader_o', 'bdict_writer_o') env = env.Clone() @@ -238,9 +239,9 @@ input_files = ChromeFileList([ '$CHROME_DIR/tools/convert_dict/aff_reader$OBJSUFFIX', '$CHROME_DIR/tools/convert_dict/aff_reader.h', '$CHROME_DIR/third_party/hunspell/google/bdict.h', - '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX', + bdict_reader_o, '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h', - '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX', + bdict_writer_o, '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h', '$CHROME_DIR/tools/convert_dict/dic_reader$OBJSUFFIX', '$CHROME_DIR/tools/convert_dict/dic_reader.h', diff --git a/chrome/third_party/hunspell/SConscript b/chrome/third_party/hunspell/SConscript index 803d17b..c2155fe 100644 --- a/chrome/third_party/hunspell/SConscript +++ b/chrome/third_party/hunspell/SConscript @@ -106,13 +106,25 @@ input_files = ChromeFileList([ MSVSFilter('google', [ 'google/bdict.h', 'google/bdict_affentry.h', - 'google/bdict_reader.cc', 'google/bdict_reader.h', - 'google/bdict_writer.cc', 'google/bdict_writer.h', ]), ]) +if env.Bit('linux'): + bdict_reader_o = env.ChromeObject('google/bdict_reader.cc') + input_files.Append(bdict_reader_o) + bdict_writer_o = env.ChromeObject('google/bdict_writer.cc') + input_files.Append(bdict_writer_o) + Export('bdict_reader_o', 'bdict_writer_o') +else: + input_files.Append( + MSVSFilter('google', [ + 'google/bdict_reader.cc', + 'google/bdict_writer.cc', + ]), + ) + env.ChromeLibrary('hunspell', input_files) diff --git a/chrome/tools/convert_dict/convert_dict.scons b/chrome/tools/convert_dict/convert_dict.scons index 0026ca7..1d7da3a 100644 --- a/chrome/tools/convert_dict/convert_dict.scons +++ b/chrome/tools/convert_dict/convert_dict.scons @@ -3,6 +3,7 @@ # found in the LICENSE file. Import('env') +Import('bdict_reader_o', 'bdict_writer_o') env = env.Clone() @@ -28,9 +29,9 @@ input_files = ChromeFileList([ 'aff_reader.cc', 'aff_reader.h', '$CHROME_DIR/third_party/hunspell/google/bdict.h', - '$CHROME_DIR/third_party/hunspell/google/bdict_reader$OBJSUFFIX', + bdict_reader_o, '$CHROME_DIR/third_party/hunspell/google/bdict_reader.h', - '$CHROME_DIR/third_party/hunspell/google/bdict_writer$OBJSUFFIX', + bdict_writer_o, '$CHROME_DIR/third_party/hunspell/google/bdict_writer.h', 'convert_dict.cc', 'dic_reader.cc', |