MacOS: Fix environ not being found
authorSmallJoker <mk939@ymail.com>
Fri, 22 May 2020 12:19:07 +0000 (14:19 +0200)
committerSmallJoker <mk939@ymail.com>
Fri, 22 May 2020 12:24:55 +0000 (14:24 +0200)
src/porting.cpp

index ef1640467d64f28feb83275d4e4694b1027a9a34..29af62f7d6347a18e37c9ad4e707bb8fb73ee23f 100644 (file)
@@ -49,6 +49,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #if defined(__ANDROID__)
        #include "porting_android.h"
 #endif
+#if defined(__APPLE__)
+       // For _NSGetEnviron()
+       // Related: https://gitlab.haskell.org/ghc/ghc/issues/2458
+       #include <crt_externs.h>
+#endif
 
 #include "config.h"
 #include "debug.h"
@@ -718,7 +723,8 @@ bool openURL(const std::string &url)
        return true;
 #elif defined(__APPLE__)
        const char *argv[] = {"open", url.c_str(), NULL};
-       return posix_spawnp(NULL, "open", NULL, NULL, (char**)argv, environ) == 0;
+       return posix_spawnp(NULL, "open", NULL, NULL, (char**)argv,
+               (*_NSGetEnviron())) == 0;
 #else
        const char *argv[] = {"xdg-open", url.c_str(), NULL};
        return posix_spawnp(NULL, "xdg-open", NULL, NULL, (char**)argv, environ) == 0;