Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3318)

Unified Diff: build/SConscript.main

Issue 27054: Multiple fixes for broken Linux SHARED=1 build. (Closed)
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/browser.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/SConscript.main
diff --git a/build/SConscript.main b/build/SConscript.main
index 2496089711784d8837456f38db0f4718b1faaf40..65587629d833ca064d77afba28286cc6322f435f 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 '
« no previous file with comments | « no previous file | chrome/browser/browser.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698