summaryrefslogtreecommitdiff
path: root/Lib/sysconfig.py
diff options
context:
space:
mode:
authorTrent Nelson <trent@trent.me>2012-10-17 04:23:50 -0400
committerTrent Nelson <trent@trent.me>2012-10-17 04:23:50 -0400
commitb4a9f247371960d7cb2dfe56fd2cf28c8a5b0744 (patch)
tree4ceb8c7addebf97d8d27a6761b5d62f174022cbd /Lib/sysconfig.py
parented0b9e963688430cd8831cfab3bfc2df12499c04 (diff)
downloadcpython-b4a9f247371960d7cb2dfe56fd2cf28c8a5b0744.tar.gz
Issue #15298: fix an OS X bootstrap issue with _sysconfigdata.py.
Reported by: Ned Deily.
Diffstat (limited to 'Lib/sysconfig.py')
-rw-r--r--Lib/sysconfig.py25
1 files changed, 19 insertions, 6 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 41a233bb6f..3450b12d72 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -390,18 +390,31 @@ def _generate_posix_vars():
if _PYTHON_BUILD:
vars['LDSHARED'] = vars['BLDSHARED']
- pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3])
- if hasattr(sys, "gettotalrefcount"):
- pybuilddir += '-pydebug'
- os.makedirs(pybuilddir, exist_ok=True)
- destfile = os.path.join(pybuilddir, '_sysconfigdata.py')
-
+ # There's a chicken-and-egg situation on OS X with regards to the
+ # _sysconfigdata module after the changes introduced by #15298:
+ # get_config_vars() is called by get_platform() as part of the
+ # `make pybuilddir.txt` target -- which is a precursor to the
+ # _sysconfigdata.py module being constructed. Unfortunately,
+ # get_config_vars() eventually calls _init_posix(), which attempts
+ # to import _sysconfigdata, which we won't have built yet. So,
+ # write out _sysconfigdata.py to the current directory first,
+ # then call get_platform() to get the pybuilddir, then move it.
+ destfile = '_sysconfigdata.py'
with open(destfile, 'w', encoding='utf8') as f:
f.write('# system configuration generated and used by'
' the sysconfig module\n')
f.write('build_time_vars = ')
pprint.pprint(vars, stream=f)
+ pybuilddir = 'build/lib.%s-%s' % (get_platform(), sys.version[:3])
+ if hasattr(sys, "gettotalrefcount"):
+ pybuilddir += '-pydebug'
+ os.makedirs(pybuilddir, exist_ok=True)
+ target = os.path.join(pybuilddir, destfile)
+
+ # Relocate _sysconfigdata.py into its final home.
+ os.rename(destfile, target)
+
# Create file used for sys.path fixup -- see Modules/getpath.c
with open('pybuilddir.txt', 'w', encoding='ascii') as f:
f.write(pybuilddir)