diff options
| author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2017-05-25 08:22:58 -0400 |
|---|---|---|
| committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2017-05-25 08:22:58 -0400 |
| commit | b4e14a64d7f51846e7c7ed94047ac545e26dce25 (patch) | |
| tree | 24dc95258ee3087c4a3ba2bbdd5a7d37f7cf0ef8 /SConstruct | |
| parent | 3e1461b80c42deda1f6b9478e2e574c6d88052f2 (diff) | |
| download | mongo-b4e14a64d7f51846e7c7ed94047ac545e26dce25.tar.gz | |
Revert "SERVER-27380 Re-enable the thin archive tool"
This reverts commit 3e1461b80c42deda1f6b9478e2e574c6d88052f2.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/SConstruct b/SConstruct index e4813b3de65..6222566afe7 100644 --- a/SConstruct +++ b/SConstruct @@ -1189,6 +1189,13 @@ env['BUILDERS']['LibraryObject'] = env['BUILDERS']['StaticObject'] if link_model.startswith("dynamic"): + # Add in the abi linking tool if the user requested and it is + # supported on this platform. + if env.get('ABIDW'): + abilink = Tool('abilink') + if abilink.exists(env): + abilink(env) + # Redirect the 'Library' target, which we always use instead of 'StaticLibrary' for things # that can be built in either mode, to point to SharedLibrary. env['BUILDERS']['Library'] = env['BUILDERS']['SharedLibrary'] @@ -1352,20 +1359,6 @@ if env['_LIBDEPS'] == '$_LIBDEPS_OBJS': libdeps.setup_environment(env, emitting_shared=(link_model.startswith("dynamic"))) -# Both the abidw tool and the thin archive tool must be loaded after -# libdeps, so that the scanners they inject can see the library -# dependencies added by libdeps. -if link_model.startswith("dynamic"): - # Add in the abi linking tool if the user requested and it is - # supported on this platform. - if env.get('ABIDW'): - abilink = Tool('abilink') - if abilink.exists(env): - abilink(env) - -if env['_LIBDEPS'] == '$_LIBDEPS_LIBS': - env.Tool('thin_archive') - if env.TargetOSIs('linux', 'freebsd', 'openbsd'): env['LINK_LIBGROUP_START'] = '-Wl,--start-group' env['LINK_LIBGROUP_END'] = '-Wl,--end-group' |