Issue #1602133: 'environ' is not really available with shared libraries on OSX
There already was a workaround for this for framework builds on OSX, this changeset enables the same workaround for shared libraries. Closes #1602133
This commit is contained in:
parent
fa3f9a38b2
commit
1c60c7ac4c
|
@ -181,6 +181,9 @@ Core and Builtins
|
|||
- Issue #13521: dict.setdefault() now does only one lookup for the given key,
|
||||
making it "atomic" for many purposes. Patch by Filip Gruszczyński.
|
||||
|
||||
- Issue #1602133: on Mac OS X a shared library build (``--enable-shared``)
|
||||
now fills the ``os.environ`` variable correctly.
|
||||
|
||||
- Issue #10538: When using the "s*" code with PyArg_ParseTuple() to fill a
|
||||
Py_buffer structure with data from an object supporting only the old
|
||||
PyBuffer interface, a reference to the source objects is now properly added
|
||||
|
|
|
@ -441,9 +441,10 @@ _PyVerify_fd_dup2(int fd1, int fd2)
|
|||
#endif
|
||||
|
||||
/* Return a dictionary corresponding to the POSIX environment table */
|
||||
#ifdef WITH_NEXT_FRAMEWORK
|
||||
#if defined(WITH_NEXT_FRAMEWORK) || (defined(__APPLE__) && defined(Py_ENABLE_SHARED))
|
||||
/* On Darwin/MacOSX a shared library or framework has no access to
|
||||
** environ directly, we must obtain it with _NSGetEnviron().
|
||||
** environ directly, we must obtain it with _NSGetEnviron(). See also
|
||||
** man environ(7).
|
||||
*/
|
||||
#include <crt_externs.h>
|
||||
static char **environ;
|
||||
|
@ -463,7 +464,7 @@ convertenviron(void)
|
|||
d = PyDict_New();
|
||||
if (d == NULL)
|
||||
return NULL;
|
||||
#ifdef WITH_NEXT_FRAMEWORK
|
||||
#if defined(WITH_NEXT_FRAMEWORK) || (defined(__APPLE__) && defined(Py_ENABLE_SHARED))
|
||||
if (environ == NULL)
|
||||
environ = *_NSGetEnviron();
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue