args -> kwargs

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2018-12-08 00:00:01 +00:00
parent 33af564899
commit 1768421dbd
23 changed files with 370 additions and 369 deletions

View File

@@ -22,32 +22,32 @@ class QemuComponent(common.Component):
def do_build(self, args):
build_dir = self.get_build_dir(args)
os.makedirs(build_dir, exist_ok=True)
if args.verbose:
if kwargs['verbose']:
verbose = ['V=1']
else:
verbose = []
if args.userland:
target_list = '{}-linux-user'.format(args.arch)
if kwargs['userland']:
target_list = '{}-linux-user'.format(kwargs['arch'])
else:
target_list = '{}-softmmu'.format(args.arch)
target_list = '{}-softmmu'.format(kwargs['arch'])
self.sh.run_cmd(
[
os.path.join(common.qemu_src_dir, 'configure'), common.Newline,
'--enable-debug', common.Newline,
'--enable-trace-backends=simple', common.Newline,
'--target-list={}'.format(target_list), common.Newline,
'--enable-sdl', common.Newline,
'--with-sdlabi=2.0', common.Newline,
os.path.join(common.qemu_src_dir, 'configure'), LF,
'--enable-debug', LF,
'--enable-trace-backends=simple', LF,
'--target-list={}'.format(target_list), LF,
'--enable-sdl', LF,
'--with-sdlabi=2.0', LF,
] +
common.add_newlines(args.extra_config_args),
common.add_newlines(kwargs['extra_config_args']),
extra_paths=[common.ccache_dir],
cwd=build_dir
)
self.sh.run_cmd(
(
[
'make', common.Newline,
'-j', str(args.nproc), common.Newline,
'make', LF,
'-j', str(kwargs['nproc']), LF,
] +
verbose