Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(456)

Unified Diff: runtime/bin/process_macos.cc

Issue 889443002: Service isolate rework take 2 (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/platform_win.cc ('k') | runtime/bin/resources_sources.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/process_macos.cc
diff --git a/runtime/bin/process_macos.cc b/runtime/bin/process_macos.cc
index b7bb9b0ba7f1ccadf9f4e0cb187098472af40b22..15b37672e51305875cedc58202fc40dcf17ceaed 100644
--- a/runtime/bin/process_macos.cc
+++ b/runtime/bin/process_macos.cc
@@ -7,6 +7,7 @@
#include "bin/process.h"
+#include <crt_externs.h> // NOLINT
#include <errno.h> // NOLINT
#include <fcntl.h> // NOLINT
#include <poll.h> // NOLINT
@@ -24,8 +25,6 @@
#include "platform/signal_blocker.h"
-extern char **environ;
-
namespace dart {
namespace bin {
@@ -456,7 +455,10 @@ class ProcessStarter {
}
if (program_environment_ != NULL) {
- environ = program_environment_;
+ // On MacOS you have to do a bit of magic to get to the
+ // environment strings.
+ char*** environ = _NSGetEnviron();
+ *environ = program_environment;
}
VOID_TEMP_FAILURE_RETRY(
« no previous file with comments | « runtime/bin/platform_win.cc ('k') | runtime/bin/resources_sources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698