diff options
| author | Ned Deily <nad@acm.org> | 2014-08-22 20:36:30 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2014-08-22 20:36:30 (GMT) |
| commit | 682c04c70c9af6df68cacce47c2f0d18c31dd443 (patch) | |
| tree | 469f3df0be598966ce411ee98cdbfbaf49141ec0 /Makefile.pre.in | |
| parent | d0aeda8f0ffbe4a7de9b492de9713d672dc8592d (diff) | |
| parent | fcbc246e9f02cc780970defbcfa01767b7e3a3c6 (diff) | |
| download | cpython-682c04c70c9af6df68cacce47c2f0d18c31dd443.zip cpython-682c04c70c9af6df68cacce47c2f0d18c31dd443.tar.gz cpython-682c04c70c9af6df68cacce47c2f0d18c31dd443.tar.bz2 | |
Issue #21166: merge from 3.4
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 848cf95..0a58b72 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -553,8 +553,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 |