diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 16:20:31 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-02 16:20:31 +0000 |
| commit | 789fbb7cd36822230870c3beff00fa30b532d14e (patch) | |
| tree | ad2e93c736af394da633f7da673ec7f87c5279fb /build | |
| parent | 3aacaf955aa4a3c505ff45a4498fa2efcca9160c (diff) | |
| download | chromium_src-789fbb7cd36822230870c3beff00fa30b532d14e.zip chromium_src-789fbb7cd36822230870c3beff00fa30b532d14e.tar.gz chromium_src-789fbb7cd36822230870c3beff00fa30b532d14e.tar.bz2 | |
Use -Wl,-{start,end}-group for LoadableModules, too.
Review URL: http://codereview.chromium.org/56180
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index db85641..a7532e4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -136,6 +136,8 @@ # Linking of large files uses lots of RAM, so serialize links # using the handy flock command from util-linux. 'FLOCK_LINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$LINK'], + 'FLOCK_SHLINK': ['flock', '$TOP_BUILDDIR/linker.lock', '$SHLINK'], + 'FLOCK_LDMODULE': ['flock', '$TOP_BUILDDIR/linker.lock', '$LDMODULE'], # We have several cases where archives depend on each other in # a cyclic fashion. Since the GNU linker does only a single @@ -152,7 +154,8 @@ # refactoring since this was first coded, which might have # eliminated the circular dependencies. 'LINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$LINKFLAGS', '$SOURCES', '$_LIBDIRFLAGS', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], - 'SHLINKCOM': [['$FLOCK_LINK', '-o', '$TARGET', '$SHLINFLAGS', '$SOURCES', '$_LIBDIRFLAGS', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], + 'SHLINKCOM': [['$FLOCK_SHLINK', '-o', '$TARGET', '$SHLINKFLAGS', '$SOURCES', '$_LIBDIRFLAGS', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], + 'LDMODULECOM': [['$FLOCK_LDMODULE', '-o', '$TARGET', '$LDMODULEFLAGS', '$SOURCES', '$_LIBDIRFLAGS', '-Wl,--start-group', '$_LIBFLAGS', '-Wl,--end-group']], 'IMPLICIT_COMMAND_DEPENDENCIES': 0, }, 'scons_import_variables': [ |