Skip to content

Commit

Permalink
Rollup merge of rust-lang#44354 - jakllsch:jakllsch-85453197-a0cc-43f…
Browse files Browse the repository at this point in the history
…6-8c55-7bce6c4a4ebf, r=Mark-Simulacrum

bootstrap: openssl for NetBSD/sparc64 in extended build

r? @Mark-Simulacrum
  • Loading branch information
Mark-Simulacrum authored Sep 6, 2017
2 parents c447c3b + 847d1ff commit ed952d8
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/bootstrap/native.rs
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,7 @@ impl Step for Openssl {
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
"s390x-unknown-linux-gnu" => "linux64-s390x",
"sparc64-unknown-netbsd" => "BSD-sparc64",
"x86_64-apple-darwin" => "darwin64-x86_64-cc",
"x86_64-linux-android" => "linux-x86_64",
"x86_64-unknown-freebsd" => "BSD-x86_64",
Expand All @@ -435,6 +436,15 @@ impl Step for Openssl {
configure.arg("-mandroid");
configure.arg("-fomit-frame-pointer");
}
if target == "sparc64-unknown-netbsd" {
// Need -m64 to get assembly generated correctly for sparc64.
configure.arg("-m64");
if build.build.contains("netbsd") {
// Disable sparc64 asm on NetBSD builders, it uses
// m4(1)'s -B flag, which NetBSD m4 does not support.
configure.arg("no-asm");
}
}
// Make PIE binaries
// Non-PIE linker support was removed in Lollipop
// https://source.android.com/security/enhancements/enhancements50
Expand Down

0 comments on commit ed952d8

Please sign in to comment.