From: Samuel Holland <samuel@sholland.org>
Date: Mon, 28 Aug 2017 16:22:11 +0000 (-0500)
Subject: Explicitly run perl for OpenSSL Configure
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=adfebed9db8d280487a8056f5b56331e3af7a33a;p=rust.git

Explicitly run perl for OpenSSL Configure

OpenSSL's Configure script is missing a shebang. On some platforms,
execve falls back to execution with the shell. Some other platforms,
like musl, will fail with an exec format error. Avoid this by calling
perl explicitly (since it's a perl script).
---

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 0a307e72bf6..dfbef044fee 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -388,7 +388,8 @@ fn run(self, builder: &Builder) {
         drop(fs::remove_dir_all(&dst));
         build.run(Command::new("tar").arg("xf").arg(&tarball).current_dir(&out));
 
-        let mut configure = Command::new(obj.join("Configure"));
+        let mut configure = Command::new("perl");
+        configure.arg(obj.join("Configure"));
         configure.arg(format!("--prefix={}", dst.display()));
         configure.arg("no-dso");
         configure.arg("no-ssl2");