Attachment #247898 for bug #337973





if nix:
    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
        env.Append( CPPFLAGS=" -Werror " )
    env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
    env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
    env.Append( LIBS=[] )


    if debugBuild:
        env.Append( CPPFLAGS=" -O0 -fstack-protector " );
        env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
    else:
        env.Append( CPPFLAGS=" -O3" )

    if debugLogging:
        env.Append( CPPFLAGS=" -D_DEBUG" );

Lines 753-758 if nix: Link Here

(-)a/SConstruct (-1 / +1 lines)
753		753
754	if linux and GetOption( "sharedclient" ):	754	if linux and GetOption( "sharedclient" ):
755	env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )	755	env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
		756	env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so.1" )
756		757
757	if debugBuild:	758	if debugBuild:
758	env.Append( CPPFLAGS=" -O0 -fstack-protector " );	759	env.Append( CPPFLAGS=" -O0 -fstack-protector " );
Lines 1539-1545 if installSetup.clientSrc: Link Here
1539		1540
1540	#lib	1541	#lib
1541	if installSetup.libraries:	1542	if installSetup.libraries:
1542	env.Install( installDir + "/" + nixLibPrefix, clientLibName )
1543	if GetOption( "sharedclient" ):	1543	if GetOption( "sharedclient" ):
1544	env.Install( installDir + "/" + nixLibPrefix, sharedClientLibName )	1544	env.Install( installDir + "/" + nixLibPrefix, sharedClientLibName )
1545		1545

Return to bug 337973

Lines 745-753 else: Link Here

(-)a/SConstruct (-4 / +2 lines)
745		745
746	if nix:	746	if nix:
747	env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )	747	env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
748	if linux:	748	env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
749	env.Append( CPPFLAGS=" -Werror " )
750	env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )	749	env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
		750	env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
751	env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )	751	env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
752	env.Append( LIBS=[] )	752	env.Append( LIBS=[] )
753		753
Lines 757-764 if nix: Link Here
757	if debugBuild:	757	if debugBuild:
758	env.Append( CPPFLAGS=" -O0 -fstack-protector " );	758	env.Append( CPPFLAGS=" -O0 -fstack-protector " );
759	env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind	759	env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
760	else:
761	env.Append( CPPFLAGS=" -O3" )
762		760
763	if debugLogging:	761	if debugLogging:
764	env.Append( CPPFLAGS=" -D_DEBUG" );	762	env.Append( CPPFLAGS=" -D_DEBUG" );