|
|
|
From ab6f929ee4584f3f1a040e55a63f493603f228d2 Mon Sep 17 00:00:00 2001
|
|
|
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
|
|
Date: Fri, 1 Jan 2016 10:27:35 +0100
|
|
|
|
Subject: [PATCH] Fix build for Gentoo
|
|
|
|
|
|
|
|
---
|
|
|
|
SConstruct | 10 +++++-----
|
|
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/SConstruct b/SConstruct
|
|
|
|
index 64c8387..fa9ab8b 100644
|
|
|
|
--- a/SConstruct
|
|
|
|
+++ b/SConstruct
|
|
|
|
@@ -1371,7 +1371,6 @@ if env.TargetOSIs('posix'):
|
|
|
|
env.Append( CCFLAGS=["-fno-omit-frame-pointer",
|
|
|
|
"-fPIC",
|
|
|
|
"-fno-strict-aliasing",
|
|
|
|
- "-ggdb",
|
|
|
|
"-pthread",
|
|
|
|
"-Wall",
|
|
|
|
"-Wsign-compare",
|
|
|
|
@@ -1382,8 +1381,9 @@ if env.TargetOSIs('posix'):
|
|
|
|
if not has_option("disable-warnings-as-errors"):
|
|
|
|
env.Append( CCFLAGS=["-Werror"] )
|
|
|
|
|
|
|
|
- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
|
|
|
|
env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
|
|
|
|
+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
|
|
|
|
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
|
|
|
|
|
|
|
|
# SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
|
|
|
|
# startup.
|
|
|
|
@@ -1398,10 +1398,10 @@ if env.TargetOSIs('posix'):
|
|
|
|
env.Append( SHLINKFLAGS=["-Wl,-z,now"] )
|
|
|
|
env.Append( LINKFLAGS=["-rdynamic"] )
|
|
|
|
|
|
|
|
- env.Append( LIBS=[] )
|
|
|
|
+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
|
|
|
|
|
|
|
|
- #make scons colorgcc friendly
|
|
|
|
- for key in ('HOME', 'TERM'):
|
|
|
|
+ #make scons colorgcc, distcc, ccache friendly
|
|
|
|
+ for key in ('HOME', 'PATH', 'TERM'):
|
|
|
|
try:
|
|
|
|
env['ENV'][key] = os.environ[key]
|
|
|
|
except KeyError:
|
|
|
|
--
|
|
|
|
2.6.4
|
|
|
|
|