Skip to content

Commit ed952d8

Browse files
Rollup merge of rust-lang#44354 - jakllsch:jakllsch-85453197-a0cc-43f6-8c55-7bce6c4a4ebf, r=Mark-Simulacrum
bootstrap: openssl for NetBSD/sparc64 in extended build r? @Mark-Simulacrum
2 parents c447c3b + 847d1ff commit ed952d8

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/bootstrap/native.rs

+10
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ impl Step for Openssl {
416416
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
417417
"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
418418
"s390x-unknown-linux-gnu" => "linux64-s390x",
419+
"sparc64-unknown-netbsd" => "BSD-sparc64",
419420
"x86_64-apple-darwin" => "darwin64-x86_64-cc",
420421
"x86_64-linux-android" => "linux-x86_64",
421422
"x86_64-unknown-freebsd" => "BSD-x86_64",
@@ -435,6 +436,15 @@ impl Step for Openssl {
435436
configure.arg("-mandroid");
436437
configure.arg("-fomit-frame-pointer");
437438
}
439+
if target == "sparc64-unknown-netbsd" {
440+
// Need -m64 to get assembly generated correctly for sparc64.
441+
configure.arg("-m64");
442+
if build.build.contains("netbsd") {
443+
// Disable sparc64 asm on NetBSD builders, it uses
444+
// m4(1)'s -B flag, which NetBSD m4 does not support.
445+
configure.arg("no-asm");
446+
}
447+
}
438448
// Make PIE binaries
439449
// Non-PIE linker support was removed in Lollipop
440450
// https://source.android.com/security/enhancements/enhancements50

0 commit comments

Comments
 (0)