Skip to content

Commit 48dcebd

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

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/bootstrap/native.rs

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

0 commit comments

Comments
 (0)