BUG: fix issue 2294.

CheckCC and assimilate did not set did_show_result up, and this caused spurious
'error: no result' messages after the check was executed.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4353 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 3749e41a065a507d12051335b1b7f26dd5bc54a1..4bf2d1c17b69db0d95ea92b934afcaffb3ad5378 100644 (file)
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -948,18 +948,22 @@ def CheckHeader(context, header, include_quotes = '<>', language = None):
 
 def CheckCC(context):
     res = SCons.Conftest.CheckCC(context)
+    context.did_show_result = 1
     return not res
 
 def CheckCXX(context):
     res = SCons.Conftest.CheckCXX(context)
+    context.did_show_result = 1
     return not res
 
 def CheckSHCC(context):
     res = SCons.Conftest.CheckSHCC(context)
+    context.did_show_result = 1
     return not res
 
 def CheckSHCXX(context):
     res = SCons.Conftest.CheckSHCXX(context)
+    context.did_show_result = 1
     return not res
 
 # Bram: Make this function obsolete?  CheckHeader() is more generic.