'HOME' : os.environ.get('HOME'),
'SSH_AGENT_PID': os.environ.get('SSH_AGENT_PID'),
'SSH_AUTH_SOCK': os.environ.get('SSH_AUTH_SOCK') },
- CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*' ],
+ CLEAN_PATTERNS = [ '*~', '#*#', '*.pyc', 'semantic.cache', '.sconsign*',
+ '.sconf_temp' ],
BUILDDIR = '${FLAVOR and "#/build/$FLAVOR" or "#"}',
CPPPATH = [ '#', '$BUILDDIR',
INLINE_OPTS_NORMAL = [ '-finline-limit=5000' ],
INLINE_OPTS = [ '$INLINE_OPTS_NORMAL' ],
CXXFLAGS = [ '-Wall', '-Woverloaded-virtual', '-Wno-long-long', '$INLINE_OPTS',
- '-pipe', '$CXXFLAGS_' ],
+ '-pipe', '$CXXFLAGS_', '-fno-strict-aliasing' ],
CXXFLAGS_ = senfutil.BuildTypeOptions('CXXFLAGS'),
CXXFLAGS_final = [ '-O3' ],
CXXFLAGS_normal = [ '-O2', '-g' ],
###########################################################################
# Configure
-# Default configuration (boost stuff)
-senfutil.Configure(env)
-
@senfconf.Test
def CheckValgrind(context):
context.Message( "Checking for valgrind... " )
- ret = context.TryAction(['valgrind --version >$TARGET'])
+ ret = context.TryAction(['$VALGRIND --version >$TARGET'])
context.Result( ret[1].strip() or False )
return ret[0]
@senfconf.Test
def CheckValgrindWildcards(context):
context.Message( "Checking whether valgrind supports '...' wildcards in suppressions... " )
- ret = context.TryAction(['valgrind --suppressions=$SOURCE /bin/true'],
+ ret = context.TryAction(['$VALGRIND --suppressions=$SOURCE /bin/true'],
"{\n test_suppression\n Memcheck:Addr4\n ...\n fun:foo\n}\n",
".sup")
context.Result( ret[0] )
return ret[0]
+# Default configuration (boost stuff)
+senfutil.Configure(env)
+
conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
env.Replace(
HAVE_VALGRIND = conf.CheckValgrind() and conf.CheckValgrindWildcards()