From 8240b32d3d274ab30ced457de542d6c7457d5850 Mon Sep 17 00:00:00 2001 From: Ernie Hershey Date: Wed, 6 Aug 2014 12:06:56 -0400 Subject: [PATCH] SERVER-14803 Support static-libstdc++ in any Unix --- SConstruct | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 5250cf45c7f..9976740d74c 100644 --- a/SConstruct +++ b/SConstruct @@ -735,8 +735,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__" ] ) @@ -891,6 +889,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"]