Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 508190
Collapse All | Expand All

(-)SConstruct (-5 / +3 lines)
Lines 811-829 if nix: Link Here
811
    # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
811
    # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
812
    env.Append( CCFLAGS=["-fPIC",
812
    env.Append( CCFLAGS=["-fPIC",
813
                         "-fno-strict-aliasing",
813
                         "-fno-strict-aliasing",
814
                         "-ggdb",
815
                         "-pthread",
814
                         "-pthread",
816
                         "-Wall",
815
                         "-Wall",
817
                         "-Wsign-compare",
816
                         "-Wsign-compare",
818
                         "-Wno-unknown-pragmas",
817
                         "-Wno-unknown-pragmas",
819
                         "-Winvalid-pch"] )
818
                         "-Winvalid-pch"] )
820
    # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
819
    # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
821
    if linux or darwin:
822
        env.Append( CCFLAGS=["-Werror", "-pipe"] )
823
820
824
    env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
821
    env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
825
    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
826
    env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
822
    env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
823
    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
824
    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
827
825
828
    # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
826
    # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
829
    # startup.
827
    # startup.
Lines 840-846 if nix: Link Here
840
    if not darwin:
838
    if not darwin:
841
        env.Append( LINKFLAGS=["-rdynamic"] )
839
        env.Append( LINKFLAGS=["-rdynamic"] )
842
840
843
    env.Append( LIBS=[] )
841
    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
844
842
845
    #make scons colorgcc friendly
843
    #make scons colorgcc friendly
846
    for key in ('HOME', 'TERM'):
844
    for key in ('HOME', 'TERM'):

Return to bug 508190