diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-05-01 12:28:57 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-05-01 21:59:29 -0400 |
| commit | 955faacc4031403733f17fb8f4d0b89e6508dc1d (patch) | |
| tree | 6b2b9b6f2f44183b247b22cd5ad57eb966fbd2f7 /site_scons | |
| parent | b44308aa773cc48a309521e8162a08aba6e2a875 (diff) | |
| download | mongo-955faacc4031403733f17fb8f4d0b89e6508dc1d.tar.gz | |
SERVER-27320 Enable fine grained application of whole archive extraction
Diffstat (limited to 'site_scons')
| -rw-r--r-- | site_scons/libdeps.py | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py index adba8dae77c..62ff3ba6cf6 100644 --- a/site_scons/libdeps.py +++ b/site_scons/libdeps.py @@ -350,25 +350,44 @@ def setup_environment(env, emitting_shared=False): env['_LIBDEPS'] = '$_LIBDEPS_LIBS' env['_LIBDEPS_TAGS'] = expand_libdeps_tags - - env['_LIBDEPS_LIBS'] = get_libdeps - + env['_LIBDEPS_GET_LIBS'] = get_libdeps env['_LIBDEPS_OBJS'] = get_libdeps_objs env['_SYSLIBDEPS'] = get_syslibdeps - env['_SHLIBDEPS'] = '$SHLIBDEP_GROUP_START ${_concat(SHLIBDEPPREFIX, __env__.subst(_LIBDEPS, target=TARGET, source=SOURCE), SHLIBDEPSUFFIX, __env__, target=TARGET, source=SOURCE)} $SHLIBDEP_GROUP_END' env[libdeps_env_var] = SCons.Util.CLVar() env[syslibdeps_env_var] = SCons.Util.CLVar() + env.Append(LIBEMITTER=libdeps_emitter) if emitting_shared: + env['_LIBDEPS_LIBS'] = '$_LIBDEPS_GET_LIBS' env.Append( PROGEMITTER=shlibdeps_emitter, SHLIBEMITTER=shlibdeps_emitter) else: + + def expand_libdeps_with_extraction_flags(source, target, env, for_signature): + result = [] + libs = get_libdeps(source, target, env, for_signature) + for lib in libs: + if 'init-no-global-side-effects' in env.Entry(lib).get_env().get('LIBDEPS_TAGS', []): + result.append(str(lib)) + else: + result.extend(env.subst('$LINK_WHOLE_ARCHIVE_LIB_START' + '$TARGET' + '$LINK_WHOLE_ARCHIVE_LIB_END', target=lib).split()) + return result + + env['_LIBDEPS_LIBS_WITH_TAGS'] = expand_libdeps_with_extraction_flags + + env['_LIBDEPS_LIBS'] = ('$LINK_WHOLE_ARCHIVE_START ' + '$LINK_LIBGROUP_START ' + '$_LIBDEPS_LIBS_WITH_TAGS ' + '$LINK_LIBGROUP_END ' + '$LINK_WHOLE_ARCHIVE_END') env.Append( PROGEMITTER=libdeps_emitter, SHLIBEMITTER=libdeps_emitter) - env.Prepend(_LIBFLAGS=' $_LIBDEPS_TAGS $LINK_WHOLE_ARCHIVE_START $LINK_LIBGROUP_START $_LIBDEPS $LINK_LIBGROUP_END $LINK_WHOLE_ARCHIVE_END $_SYSLIBDEPS ') + env.Prepend(_LIBFLAGS='$_LIBDEPS_TAGS $_LIBDEPS $_SYSLIBDEPS ') for builder_name in ('Program', 'SharedLibrary', 'LoadableModule'): try: update_scanner(env['BUILDERS'][builder_name]) |