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

11 files changed, 52 insertions, 9 deletions

diff --git a/build/SConscript.main b/build/SConscript.main
index 2496089..6558762 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -479,7 +479,7 @@ linux_env.Replace(
     # ideal world we would only make groups from those libraries which we knew
     # to be in cycles. However, that's tough with SCons, so we bodge it by
     # making all the archives a group by redefining the linking command here.
-    SHLINKCOM = ('$SHLINK -shared -o $TARGET $SHLINKFLAGS $SOURCES '
+    SHLINKCOM = ('$SHLINK -o $TARGET $SHLINKFLAGS $SOURCES '
                  '$_LIBDIRFLAGS '
                  '-Wl,--start-group $_LIBFLAGS -Wl,--end-group'),
     LINKCOM = ('$LINK -o $TARGET $LINKFLAGS $SOURCES '
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',
diff --git a/net/net_lib.scons b/net/net_lib.scons
index efe3bbf..10453b4 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -11,8 +11,11 @@ Import('env')
 env = env.Clone()
 
 env.ApplySConscript([
+    '$BZIP2_DIR/using_bzip2.scons',
+    '$CHROME_SRC_DIR/build/using_googleurl.scons',
     '$GRIT_DIR/build/using_generated_resources.scons',
     '$ICU38_DIR/using_icu38.scons',
+    '$MODP_B64_DIR/using_modp_b64.scons',
     '$SDCH_DIR/using_sdch.scons',
     '$ZLIB_DIR/using_zlib.scons',
 ])
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',