Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-103186: In test_tools.freeze, fetch CONFIG_ARGS from original source directory (#103213) 

Fetch CONFIG_ARGS from the original source directory, instead of from
the copied source tree. When "make clean" is executed in the copied
source tree, the build directory is cleared and the configure argument
lookup fails. However, the original source directory still contains this
information.
This commit is contained in:
Ijtaba Hussain 2023-07-11 23:22:18 +01:00 committed by GitHub
parent da86db56cb
commit de827322ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS.d/next/Tools-Demos/2023-04-05-07-19-36.gh-issue-103186.yEozgK.rst Normal file
View File

@ -0,0 +1,2 @@
``freeze`` now fetches ``CONFIG_ARGS`` from the original CPython instance
the Makefile uses to call utility scripts. Patch by Ijtaba Hussain.

2
Tools/freeze/test/freeze.py
View File

@ -153,7 +153,7 @@ def prepare(script=None, outdir=None):
print(f'configuring python in {builddir}...') print(f'configuring python in {builddir}...')
cmd = [ cmd = [
os.path.join(srcdir, 'configure'), os.path.join(srcdir, 'configure'),
*shlex.split(get_config_var(srcdir, 'CONFIG_ARGS') or ''), *shlex.split(get_config_var(SRCDIR, 'CONFIG_ARGS') or ''),
] ]
ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache')) ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))
prefix = os.path.join(outdir, 'python-installation') prefix = os.path.join(outdir, 'python-installation')