Skip to content
Snippets Groups Projects
Commit a499af94 authored by g0dil's avatar g0dil
Browse files

Fix SCons 1.2.0 build failure

parent b1a93bd8
No related branches found
No related tags found
No related merge requests found
......@@ -89,11 +89,10 @@ def BoostUnitTest(env, target=None, source=None, **kw):
**kw)
stamp = env.Command(stampnode, bin,
[ '$SOURCE $BOOSTTESTARGS',
'touch $TARGET' ],
[ '$SOURCE $BOOSTTESTARGS', SCons.Script.Touch('$TARGET')],
**kw)
alias = env.Command(env.File(target), stamp, [])
alias = env.Command(env.File(target), stamp, [ env.NopAction() ] )
compileTests = [ src for src in source
if src.suffix in SCons.Tool.cplusplus.CXXSuffixes \
......@@ -109,6 +108,11 @@ def BoostUnitTest(env, target=None, source=None, **kw):
def FindAllBoostUnitTests(env, target, source):
return _ALL_TESTS
def NopAction(env, target, source):
def nop(target, source, env) : return None
def nopstr(target, source, env) : return ''
return env.Action(nop, nopstr)
def generate(env):
env.SetDefault(
BOOST_VARIANT = '',
......@@ -131,6 +135,7 @@ def generate(env):
source_scanner = SCons.Scanner.C.CScanner(),
single_source=1
)
env['BUILDERS']['NopAction'] = NopAction
def exists(env):
return True
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment