mirror of
https://github.com/python/cpython.git
synced 2025-08-30 21:48:47 +00:00
Merge issue #15298: ensure _sysconfigdata is generated in build directory,
not source directory. Patch by: Richard Oudkerk (sbt).
This commit is contained in:
commit
b16269e375
4 changed files with 28 additions and 28 deletions
14
setup.py
14
setup.py
|
@ -33,10 +33,6 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_AR
|
|||
# This global variable is used to hold the list of modules to be disabled.
|
||||
disabled_module_list = []
|
||||
|
||||
# File which contains the directory for shared mods (for sys.path fixup
|
||||
# when running from the build dir, see Modules/getpath.c)
|
||||
_BUILDDIR_COOKIE = "pybuilddir.txt"
|
||||
|
||||
def add_dir_to_list(dirlist, dir):
|
||||
"""Add the directory 'dir' to the list 'dirlist' (after any relative
|
||||
directories) if:
|
||||
|
@ -252,16 +248,6 @@ class PyBuildExt(build_ext):
|
|||
args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
|
||||
self.compiler.set_executables(**args)
|
||||
|
||||
# Not only do we write the builddir cookie, but we manually install
|
||||
# the shared modules directory if it isn't already in sys.path.
|
||||
# Otherwise trying to import the extensions after building them
|
||||
# will fail.
|
||||
with open(_BUILDDIR_COOKIE, "wb") as f:
|
||||
f.write(self.build_lib.encode('utf-8', 'surrogateescape'))
|
||||
abs_build_lib = os.path.join(os.getcwd(), self.build_lib)
|
||||
if abs_build_lib not in sys.path:
|
||||
sys.path.append(abs_build_lib)
|
||||
|
||||
build_ext.build_extensions(self)
|
||||
|
||||
longest = max([len(e.name) for e in self.extensions])
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue