summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/SConf.py
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-09-09 03:10:46 (GMT)
committerDavid Cournapeau <cournape@gmail.com>2009-09-09 03:10:46 (GMT)
commit0dfeb98c7b81ae4552c39460bba3673ca577b2f6 (patch)
tree229cb638cb98c2008026e4189bf2f718c32327ea /src/engine/SCons/SConf.py
parent2426e20e2cc3f13e480c5e4ce2b202614b1314e6 (diff)
downloadSCons-0dfeb98c7b81ae4552c39460bba3673ca577b2f6.zip
SCons-0dfeb98c7b81ae4552c39460bba3673ca577b2f6.tar.gz
SCons-0dfeb98c7b81ae4552c39460bba3673ca577b2f6.tar.bz2
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.
Diffstat (limited to 'src/engine/SCons/SConf.py')
-rw-r--r--src/engine/SCons/SConf.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 3749e41..4bf2d1c 100644
--- 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.