]> git.lizzy.rs Git - rust.git/commitdiff
bootstrap: avoid m4 -B for NetBSD-built sparc64 OpenSSL
authorJonathan A. Kollasch <jakllsch@kollasch.net>
Thu, 31 Aug 2017 14:36:10 +0000 (09:36 -0500)
committerJonathan A. Kollasch <jakllsch@kollasch.net>
Tue, 5 Sep 2017 21:31:14 +0000 (16:31 -0500)
src/bootstrap/native.rs

index ee00ee57e94d82e16688382908f6001e92b315d8..b3929516470a6277c06faa6db0668935ddb8976b 100644 (file)
@@ -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