Skip to content

[wasm] Use __wasilibc_get_environ to get environ #4882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CoreFoundation/Base.subproj/CFPlatform.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#include <mach-o/dyld.h>
#endif

#if TARGET_OS_WASI
#include <wasi/libc-environ.h>
#endif

#define _CFEmitInternalDiagnostics 0


Expand Down Expand Up @@ -1812,8 +1816,10 @@ CF_EXPORT char **_CFEnviron(void) {
return *_NSGetEnviron();
#elif TARGET_OS_WIN32
return _environ;
#elif TARGET_OS_WASI
return __wasilibc_get_environ();
#else
#if TARGET_OS_BSD || TARGET_OS_WASI
#if TARGET_OS_BSD
extern char **environ;
#endif
return environ;
Expand Down