From a499af94a5b0a5cf90806a49326ec67aa5be4d7c Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Fri, 21 Aug 2009 08:50:16 +0000
Subject: [PATCH] Fix SCons 1.2.0 build failure
---
site_scons/site_tools/Boost.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/site_scons/site_tools/Boost.py b/site_scons/site_tools/Boost.py
index 4e07ac3ac..7c0255b26 100644
--- a/site_scons/site_tools/Boost.py
+++ b/site_scons/site_tools/Boost.py
@@ -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
--
GitLab