diff options
| -rwxr-xr-x | configure.py | 6 | ||||
| -rwxr-xr-x | src/scripts/cleanup.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.py b/configure.py index 4c8352e84..3ac4c82dd 100755 --- a/configure.py +++ b/configure.py @@ -3169,11 +3169,11 @@ def main_action_configure_build(info_modules, source_paths, options, build_config.external_include_dir) if options.amalgamation: - (amalgamation_cpp_files, amalgamation_headers) = AmalgamationGenerator(build_config, using_mods, options).generate() - build_config.lib_sources = amalgamation_cpp_files + (amalg_cpp_files, amalg_headers) = AmalgamationGenerator(build_config, using_mods, options).generate() + build_config.lib_sources = amalg_cpp_files template_vars.update(MakefileListsGenerator(build_config, options, using_mods, cc, arch, osinfo).generate()) - template_vars['generated_files'] = ' '.join(amalgamation_cpp_files + amalgamation_headers) + template_vars['generated_files'] = ' '.join(amalg_cpp_files + amalg_headers) with open(os.path.join(build_config.build_dir, 'build_config.json'), 'w') as f: json.dump(template_vars, f, sort_keys=True, indent=2) diff --git a/src/scripts/cleanup.py b/src/scripts/cleanup.py index de64edde8..6e4689003 100755 --- a/src/scripts/cleanup.py +++ b/src/scripts/cleanup.py @@ -22,7 +22,7 @@ def remove_dir(d): logging.debug('Removing directory "%s"', d) shutil.rmtree(d) else: - logging.debug('Directory %s was missing', f) + logging.debug('Directory %s was missing', d) except Exception as e: # pylint: disable=broad-except logging.error('Failed removing directory "%s": %s', d, e) |