diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2014-08-06 12:06:56 -0400 |
|---|---|---|
| committer | Ernie Hershey <ernie.hershey@10gen.com> | 2015-02-12 17:50:10 -0500 |
| commit | 91ab64a4c0b8032120d319bb8c193b6d844a9583 (patch) | |
| tree | 96a719d88b988a0bf68fe607159ecc7e33bfa899 | |
| parent | 8f1c734c7f1862180f607c241fb167640889efba (diff) | |
| download | mongo-91ab64a4c0b8032120d319bb8c193b6d844a9583.tar.gz | |
SERVER-14803 Support static-libstdc++ in any Unix
(cherry picked from commit 8240b32d3d274ab30ced457de542d6c7457d5850)
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index d39b444202f..987f5e75137 100644 --- a/SConstruct +++ b/SConstruct @@ -675,8 +675,6 @@ elif linux: if static: env.Append( LINKFLAGS=" -static " ) - if has_option( "static-libstdc++" ): - env.Append( LINKFLAGS=["-static-libstdc++", "-static-libgcc"] ) elif solaris: env.Append( CPPDEFINES=[ "__sunos__" ] ) @@ -810,6 +808,9 @@ elif windows: env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 if nix: + if has_option( "static-libstdc++" ): + env.Append( LINKFLAGS=["-static-libstdc++", "-static-libgcc"] ) + if has_option( "distcc" ): env["CXX"] = "distcc " + env["CXX"] |