./build-userland: resolve relative paths

This commit is contained in:
Ciro Santilli 六四事件 法轮功
2019-03-13 00:00:03 +00:00
parent 276688bb33
commit e32b1cba45
6 changed files with 68 additions and 7 deletions

4
run
View File

@@ -350,7 +350,7 @@ Run QEMU with VNC instead of the default SDL. Connect to it with:
if self.env['userland'] is not None:
cmd.extend([
self.env['gem5_se_file'], LF,
'--cmd', self.resolve_userland(self.env['userland']), LF,
'--cmd', self.resolve_userland_executable(self.env['userland']), LF,
])
if self.env['userland_args'] is not None:
cmd.extend(['--options', self.env['userland_args'], LF])
@@ -607,7 +607,7 @@ Run QEMU with VNC instead of the default SDL. Connect to it with:
cmd.extend(self.env['extra_emulator_args'])
if self.env['emulator'] == 'qemu' and self.env['userland']:
# The program and arguments must come at the every end of the CLI.
cmd.extend([self.resolve_userland(self.env['userland']), LF])
cmd.extend([self.resolve_userland_executable(self.env['userland']), LF])
if self.env['userland_args'] is not None:
cmd.extend(self.sh.shlex_split(self.env['userland_args']))
if debug_vm or self.env['terminal']: