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 /build | |
| 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 'build')
| -rw-r--r-- | build/SConscript.main | 2 |
1 files changed, 1 insertions, 1 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 ' |