diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-12-04 13:39:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-04 13:39:15 +0100 |
| commit | 31a8393cf6a74c870c3484dd68500619f6232c6d (patch) | |
| tree | 11a7d0b4f4df344e1dbe9798a7d48ca2acc8abae /Makefile.pre.in | |
| parent | 70d56fb52582d9d3f7c00860d6e90570c6259371 (diff) | |
| download | cpython-git-31a8393cf6a74c870c3484dd68500619f6232c6d.tar.gz | |
Revert "bpo-32197: Try to fix a compiler error on OS X introduced in bpo-32030. (#4681)" (#4694)
* Revert "bpo-32197: Try to fix a compiler error on OS X introduced in bpo-32030. (#4681)"
This reverts commit 13badcbc60cdbfae1dba1683fd2fae9d70717143.
Re-apply commits:
* "bpo-32030: _PyPathConfig_Init() sets home and program_name (#4673)"
commit af5a895073c24637c094772b27526b94a12ec897.
* "bpo-32030: Fix config_get_program_name() on macOS (#4669)"
commit e23c06e2b03452c9aaf0dae52296c85e572f9bcd.
* "bpo-32030: Add Python/pathconfig.c (#4668)"
commit 0ea395ae964c9cd0f499e2ef0d0030c971201220.
* "bpo-32030: Don't call _PyPathConfig_Fini() in Py_FinalizeEx() (#4667)"
commit ebac19dad6263141d5db0a2c923efe049dba99d2.
* "bpo-32030: Fix Py_GetPath(): init program_name (#4665)"
commit 9ac3d8882712c9675c3d2f9f84af6b5729575cde.
* Fix compilation error on macOS
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index f425a89173..14f6f8abc5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -337,8 +337,9 @@ PYTHON_OBJS= \ Python/importdl.o \ Python/marshal.o \ Python/modsupport.o \ - Python/mystrtoul.o \ Python/mysnprintf.o \ + Python/mystrtoul.o \ + Python/pathconfig.o \ Python/peephole.o \ Python/pyarena.o \ Python/pyctype.o \ |