Bug 1428950 - Unbreak build on BSDs after bug 1297740. r=gcp
authorJan Beich <jbeich@FreeBSD.org>
Tue, 09 Jan 2018 02:13:20 +0000
changeset 452589 4248602674ff589f368a4b868fa4743a033640e4
parent 452588 afb1b6f44c253a47fb896c0509aa0c2c95c53522
child 452623 7c9de87c6eb02d7448297bff489f27cb20c33d24
child 452628 a9c97c2aa4b9551ca53a3b22163c0d0ddf784b3d
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgcp
bugs1428950, 1297740
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1428950 - Unbreak build on BSDs after bug 1297740. r=gcp
ipc/chromium/src/base/process_util_bsd.cc
--- a/ipc/chromium/src/base/process_util_bsd.cc
+++ b/ipc/chromium/src/base/process_util_bsd.cc
@@ -36,17 +36,17 @@ bool LaunchApp(const std::vector<std::st
     argv_copy[i] = const_cast<char*>(argv[i].c_str());
   }
   argv_copy[argv.size()] = NULL;
 
   // Make sure we don't leak any FDs to the child process by marking all FDs
   // as close-on-exec.
   SetAllFDsToCloseOnExec();
 
-  EnvironmentArray vars = BuildEnvironmentArray(options.environ);
+  EnvironmentArray vars = BuildEnvironmentArray(options.env_map);
 
   posix_spawn_file_actions_t file_actions;
   if (posix_spawn_file_actions_init(&file_actions) != 0) {
     return false;
   }
 
   // Turn fds_to_remap array into a set of dup2 calls.
   for (const auto& fd_map : options.fds_to_remap) {