diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-06-05 08:18:01 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2021-10-17 13:50:44 +0200 |
| commit | c7b7b5af273cca2c90d5fa3edf27ae0746d5dcfe (patch) | |
| tree | d8fda6c92eb872169dca531d5f039ba844aad0c4 | |
| parent | Redo distutils C++ hacks from CPython patchset (diff) | |
| download | pypy-gentoo-3.8-7.3.6.tar.gz pypy-gentoo-3.8-7.3.6.tar.bz2 pypy-gentoo-3.8-7.3.6.zip | |
distutils: make -OO enable both opt-1 and opt-2 optimizationgentoo-3.8-7.3.6
Bug: http://bugs.python.org/issue27226
Bug: https://bugs.gentoo.org/585060
| -rw-r--r-- | lib-python/3/distutils/command/build_py.py | 8 | ||||
| -rw-r--r-- | lib-python/3/distutils/command/install_lib.py | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib-python/3/distutils/command/build_py.py b/lib-python/3/distutils/command/build_py.py index edc2171cd1..e34749d6eb 100644 --- a/lib-python/3/distutils/command/build_py.py +++ b/lib-python/3/distutils/command/build_py.py @@ -315,9 +315,9 @@ class build_py (Command): if self.compile: outputs.append(importlib.util.cache_from_source( filename, optimization='')) - if self.optimize > 0: + for opt in range(1, self.optimize + 1): outputs.append(importlib.util.cache_from_source( - filename, optimization=self.optimize)) + filename, optimization=opt)) outputs += [ os.path.join(build_dir, filename) @@ -387,8 +387,8 @@ class build_py (Command): if self.compile: byte_compile(files, optimize=0, force=self.force, prefix=prefix, dry_run=self.dry_run) - if self.optimize > 0: - byte_compile(files, optimize=self.optimize, + for opt in range(1, self.optimize + 1): + byte_compile(files, optimize=opt, force=self.force, prefix=prefix, dry_run=self.dry_run) class build_py_2to3(build_py, Mixin2to3): diff --git a/lib-python/3/distutils/command/install_lib.py b/lib-python/3/distutils/command/install_lib.py index 6154cf0943..049b662566 100644 --- a/lib-python/3/distutils/command/install_lib.py +++ b/lib-python/3/distutils/command/install_lib.py @@ -24,8 +24,8 @@ class install_lib(Command): # 2) compile .pyc only (--compile --no-optimize; default) # 3) compile .pyc and "opt-1" .pyc (--compile --optimize) # 4) compile "opt-1" .pyc only (--no-compile --optimize) - # 5) compile .pyc and "opt-2" .pyc (--compile --optimize-more) - # 6) compile "opt-2" .pyc only (--no-compile --optimize-more) + # 5) compile .pyc, "opt-1" and "opt-2" .pyc (--compile --optimize-more) + # 6) compile "opt-1" and "opt-2" .pyc (--no-compile --optimize-more) # # The UI for this is two options, 'compile' and 'optimize'. # 'compile' is strictly boolean, and only decides whether to @@ -132,8 +132,8 @@ class install_lib(Command): byte_compile(files, optimize=0, force=self.force, prefix=install_root, dry_run=self.dry_run) - if self.optimize > 0: - byte_compile(files, optimize=self.optimize, + for opt in range(1, self.optimize + 1): + byte_compile(files, optimize=opt, force=self.force, prefix=install_root, verbose=self.verbose, dry_run=self.dry_run) @@ -167,9 +167,9 @@ class install_lib(Command): if self.compile: bytecode_files.append(importlib.util.cache_from_source( py_file, optimization='')) - if self.optimize > 0: + for opt in range(1, self.optimize + 1): bytecode_files.append(importlib.util.cache_from_source( - py_file, optimization=self.optimize)) + py_file, optimization=opt)) return bytecode_files |