diff options
| author | David Robillard <d@drobilla.net> | 2019-04-14 18:03:16 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-04-14 18:24:08 +0200 |
| commit | 7887266eaf79f020dae2dd0126dbf732e167a751 (patch) | |
| tree | 3a22565bc33f5b15c191d8585bc84599836c33f7 /waflib/Scripting.py | |
| parent | ee834a83860e614d565f5bb38cdfb8681ffa5f16 (diff) | |
| parent | 4806680e7b17a83c14ea2b64c8ab6277a8b380b1 (diff) | |
| download | pugl-7887266eaf79f020dae2dd0126dbf732e167a751.tar.gz pugl-7887266eaf79f020dae2dd0126dbf732e167a751.tar.bz2 pugl-7887266eaf79f020dae2dd0126dbf732e167a751.zip | |
Update autowaf
Diffstat (limited to 'waflib/Scripting.py')
| -rw-r--r-- | waflib/Scripting.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/waflib/Scripting.py b/waflib/Scripting.py index 749d4f2..ae17a8b 100644 --- a/waflib/Scripting.py +++ b/waflib/Scripting.py @@ -216,7 +216,10 @@ def parse_options(): ctx = Context.create_context('options') ctx.execute() if not Options.commands: - Options.commands.append(default_cmd) + if isinstance(default_cmd, list): + Options.commands.extend(default_cmd) + else: + Options.commands.append(default_cmd) if Options.options.whelp: ctx.parser.print_help() sys.exit(0) @@ -280,7 +283,7 @@ def distclean_dir(dirname): pass try: - shutil.rmtree('c4che') + shutil.rmtree(Build.CACHE_DIR) except OSError: pass @@ -598,12 +601,15 @@ def autoconfigure(execute_method): cmd = env.config_cmd or 'configure' if Configure.autoconfig == 'clobber': tmp = Options.options.__dict__ + launch_dir_tmp = Context.launch_dir if env.options: Options.options.__dict__ = env.options + Context.launch_dir = env.launch_dir try: run_command(cmd) finally: Options.options.__dict__ = tmp + Context.launch_dir = launch_dir_tmp else: run_command(cmd) run_command(self.cmd) |