From 847d1ffbe95729f4e22db022298a7b22c94ad18b Mon Sep 17 00:00:00 2001 From: "Jonathan A. Kollasch" Date: Thu, 31 Aug 2017 09:36:10 -0500 Subject: [PATCH] bootstrap: avoid m4 -B for NetBSD-built sparc64 OpenSSL --- src/bootstrap/native.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index ee00ee57e94..b3929516470 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -439,6 +439,11 @@ fn run(self, builder: &Builder) { 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