diff options
| author | Ned Deily <nad@acm.org> | 2014-08-22 13:32:49 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2014-08-22 13:32:49 -0700 |
| commit | fcbc246e9f02cc780970defbcfa01767b7e3a3c6 (patch) | |
| tree | ffd688ef004d7d04328ecbf1d7401df1effe22e7 /Makefile.pre.in | |
| parent | 0242f79051cd43343bafa797c2bfa9512f7be6c2 (diff) | |
| download | cpython-git-fcbc246e9f02cc780970defbcfa01767b7e3a3c6.tar.gz | |
Issue #21166: Prevent possible segfaults and other random failures of
python --generate-posix-vars in pybuilddir.txt build target by ensuring
that pybuilddir.txt is always regenerated when configure is run and
that the newly built skeleton python does not inadvertently import
modules from previously installed instances.
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 3b4e21edae..c0f0c7b5a7 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -546,8 +546,18 @@ platform: $(BUILDPYTHON) pybuilddir.txt # Create build directory and generate the sysconfig build-time data there. # pybuilddir.txt contains the name of the build dir and is used for # sys.path fixup -- see Modules/getpath.c. +# Since this step runs before shared modules are built, try to avoid bootstrap +# problems by creating a dummy pybuildstr.txt just to allow interpreter +# initialization to succeed. It will be overwritten by generate-posix-vars +# or removed in case of failure. pybuilddir.txt: $(BUILDPYTHON) - $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars + @echo "none" > ./pybuilddir.txt + $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ + if test $$? -ne 0 ; then \ + echo "generate-posix-vars failed" ; \ + rm -f ./pybuilddir.txt ; \ + exit 1 ; \ + fi # Build the shared modules # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for |