Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
f6774f2f1e
2 changed files with 2 additions and 2 deletions
|
@ -80,4 +80,4 @@ def compile(cli):
|
|||
return False
|
||||
|
||||
target.configure(parallel=cli.config.compile.parallel, clean=cli.args.clean, compiledb=cli.args.compiledb)
|
||||
target.compile(cli.args.target, dry_run=cli.args.dry_run, **envs)
|
||||
return target.compile(cli.args.target, dry_run=cli.args.dry_run, **envs)
|
||||
|
|
|
@ -113,4 +113,4 @@ def flash(cli):
|
|||
return False
|
||||
|
||||
target.configure(parallel=cli.config.flash.parallel, clean=cli.args.clean)
|
||||
target.compile(cli.args.bootloader, dry_run=cli.args.dry_run, **envs)
|
||||
return target.compile(cli.args.bootloader, dry_run=cli.args.dry_run, **envs)
|
||||
|
|
Loading…
Reference in a new issue