diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-09-06 18:28:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 18:28:05 -0600 |
| commit | 48dcebd5862a36644c06228cabcfa8b5d9060f1d (patch) | |
| tree | 903d0ece8388f2a5db7620588955fc40c720b21a | |
| parent | eba44f10f9f023ff71152805d4e6d1318964fd0e (diff) | |
| parent | 847d1ffbe95729f4e22db022298a7b22c94ad18b (diff) | |
| download | rust-48dcebd5862a36644c06228cabcfa8b5d9060f1d.tar.gz rust-48dcebd5862a36644c06228cabcfa8b5d9060f1d.zip | |
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
| -rw-r--r-- | src/bootstrap/native.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index d9dc9df823a..2cbae083fc4 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -417,6 +417,7 @@ impl Step for Openssl { "powerpc64-unknown-linux-gnu" => "linux-ppc64", "powerpc64le-unknown-linux-gnu" => "linux-ppc64le", "s390x-unknown-linux-gnu" => "linux64-s390x", + "sparc64-unknown-netbsd" => "BSD-sparc64", "x86_64-apple-darwin" => "darwin64-x86_64-cc", "x86_64-linux-android" => "linux-x86_64", "x86_64-unknown-freebsd" => "BSD-x86_64", @@ -436,6 +437,15 @@ impl Step for Openssl { configure.arg("-mandroid"); configure.arg("-fomit-frame-pointer"); } + 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 // https://source.android.com/security/enhancements/enhancements50 |