Properly inherit the environment on darwin where environ is not available for shared libraries.

llvm-svn: 101710
This commit is contained in:
Benjamin Kramer 2010-04-18 09:16:04 +00:00
parent f93df19496
commit 1360e9e270
1 changed files with 6 additions and 1 deletions

View File

@ -34,6 +34,8 @@
#include <spawn.h>
#if !defined(__APPLE__)
extern char **environ;
#else
#include <crt_externs.h> // _NSGetEnviron
#endif
#endif
@ -202,8 +204,11 @@ Program::Execute(const Path &path, const char **args, const char **envp,
}
}
if (!envp)
#if !defined(__APPLE__)
if (!envp) envp = (const char**)environ;
envp = (const char**)environ;
#else
envp = (const char**)*_NSGetEnviron(); // environ is missing in dylibs.
#endif
pid_t PID;