GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-25 08:31:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildman: Show 'make' command line when -V is used

Browse source 
When a verbose build it selected, show the make command before the output of
that command.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2015-02-05 22:06:12 -07:00
parent 741e58e0fc
commit 40f11fce7c
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/buildman/builder.py
View file

@ -335,6 +335,9 @@ class Builder:
cmd = [self.gnu_make] + list(args) cmd = [self.gnu_make] + list(args)
result = command.RunPipe([cmd], capture=True, capture_stderr=True, result = command.RunPipe([cmd], capture=True, capture_stderr=True,
cwd=cwd, raise_on_error=False, **kwargs) cwd=cwd, raise_on_error=False, **kwargs)
if self.verbose_build:
result.stdout = '%s\n' % (' '.join(cmd)) + result.stdout
result.combined = '%s\n' % (' '.join(cmd)) + result.combined
return result return result
def ProcessResult(self, result): def ProcessResult(self, result):

5
tools/buildman/builderthread.py
View file

@ -209,14 +209,17 @@ class BuilderThread(threading.Thread):
if do_config: if do_config:
result = self.Make(commit, brd, 'mrproper', cwd, result = self.Make(commit, brd, 'mrproper', cwd,
'mrproper', *args, env=env) 'mrproper', *args, env=env)
config_out = result.combined
result = self.Make(commit, brd, 'config', cwd, result = self.Make(commit, brd, 'config', cwd,
*(args + config_args), env=env) *(args + config_args), env=env)
config_out = result.combined config_out += result.combined
do_config = False # No need to configure next time do_config = False # No need to configure next time
if result.return_code == 0: if result.return_code == 0:
result = self.Make(commit, brd, 'build', cwd, *args, result = self.Make(commit, brd, 'build', cwd, *args,
env=env) env=env)
result.stderr = result.stderr.replace(src_dir + '/', '') result.stderr = result.stderr.replace(src_dir + '/', '')
if self.builder.verbose_build:
result.stdout = config_out + result.stdout
else: else:
result.return_code = 1 result.return_code = 1
result.stderr = 'No tool chain for %s\n' % brd.arch result.stderr = 'No tool chain for %s\n' % brd.arch