---

yaml
---
r: 15186
b: refs/heads/try
c: e950313
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 635b55100c37906ac53a9130873d9392e545e6e7
+refs/heads/try: e9503131556656d7ae0ad583b9d9ed81755a3746
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_run_program.cpp

@@ -163,19 +163,15 @@ rust_run_program(const char* argv[],
         assert(!result && "chdir failed");
     }
 
-#ifdef __APPLE__
     if (envp) {
+#ifdef __APPLE__
         *_NSGetEnviron() = (char **)envp;
-    }
-    execvp(argv[0], (char * const *)argv);
-#elif __FreeBSD__ || (defined(__linux__) && defined(RUST_SNAPSHOT))
-    if (envp) { environ = (char **)envp; }
-    execvp(argv[0], (char * const *)argv);
 #else
-    if (!envp) { envp = environ; }
-    execvpe(argv[0], (char * const *)argv, (char * const *)envp);
+        environ = (char **)envp;
 #endif
+    }
 
+    execvp(argv[0], (char * const *)argv);
     exit(1);
 }