diff options
| author | Jonathan A. Kollasch <jakllsch@kollasch.net> | 2017-08-31 09:36:10 -0500 |
|---|---|---|
| committer | Jonathan A. Kollasch <jakllsch@kollasch.net> | 2017-09-05 16:31:14 -0500 |
| commit | 847d1ffbe95729f4e22db022298a7b22c94ad18b (patch) | |
| tree | d02e88ae14845c0a0bcca030b2fb2160a878b095 | |
| parent | 2047a0d083ad8bf651d00287267e0ef418ef50f5 (diff) | |
| download | rust-847d1ffbe95729f4e22db022298a7b22c94ad18b.tar.gz rust-847d1ffbe95729f4e22db022298a7b22c94ad18b.zip | |
bootstrap: avoid m4 -B for NetBSD-built sparc64 OpenSSL
| -rw-r--r-- | src/bootstrap/native.rs | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ impl Step for Openssl { 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 |