TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix display of failed PCH node generation

Browse source 
enable_build_failure_summary=1 assumed that the command to display was a
list.  For internal pseudo-commands, such as write_pch_inclusion_file,
the command was a string, so calling ' '.join() was incorrect.  When the
output is not a list, pass it through unchanged.
This commit is contained in:
Kp 2018-08-29 01:47:42 +00:00
parent e71bf215a8
commit e27f341acd
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -3206,7 +3206,8 @@ class PCHManager(object):
@classmethod
def write_pch_inclusion_file(cls,target,source,env):
target = str(target[0])
fd, path = cls._tempfile_mkstemp(suffix='', prefix='%s.' % os.path.basename(target), dir=os.path.dirname(target), text=True)
dn, bn = os.path.split(target)
fd, path = cls._tempfile_mkstemp(suffix='', prefix='%s.' % bn, dir=dn, text=True)
# source[0].get_contents() returns the comment-stripped form
os.write(fd, source[0].__generated_pch_text)
os.close(fd)
@ -4773,7 +4774,8 @@ class DXXProgram(DXXCommon):
node.append('\t%s\n' % f.node)
# Sacrifice some precision so that the printed output is
# valid shell input.
command.append('\n %s' % ' '.join(f.command))
c = f.command
command.append('\n %s' % (' '.join(c) if isinstance(c, list) else c))
if not total:
return
print("Failed target count: total=%u; targets with enable_build_failure_summary=1: %u" % (total, len(node)))