about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-02-25 15:54:51 +0800
committerkennytm <kennytm@gmail.com>2018-02-25 21:30:47 +0800
commit266386a10e8129a9c3c060362d4d170160b1002d (patch)
tree4efdc9d4c63f4d988c3922c9170eb766a7680b84
parentc9b6dcaaf9d7a42dc8b9294736e9743d1806fa29 (diff)
parent0b6583ed97aa323cfa3e40d1cb1a1759fb0e1fc1 (diff)
downloadrust-266386a10e8129a9c3c060362d4d170160b1002d.tar.gz
rust-266386a10e8129a9c3c060362d4d170160b1002d.zip
Rollup merge of #48489 - glaubitz:x32-linux, r=alexcrichton
bootstrap: Add openssl configuration for x86_64-unknown-linux-gnux32

OpenSSL provides a native configuration for x86_64-unknown-linux-gnux32:

> https://github.com/openssl/openssl/blob/master/Configurations/10-main.conf#L810

Let's use it.
-rw-r--r--src/bootstrap/native.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index a4c6f397f81..15dd7fabfa5 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -492,6 +492,7 @@ impl Step for Openssl {
             "x86_64-unknown-freebsd" => "BSD-x86_64",
             "x86_64-unknown-dragonfly" => "BSD-x86_64",
             "x86_64-unknown-linux-gnu" => "linux-x86_64",
+            "x86_64-unknown-linux-gnux32" => "linux-x32",
             "x86_64-unknown-linux-musl" => "linux-x86_64",
             "x86_64-unknown-netbsd" => "BSD-x86_64",
             _ => panic!("don't know how to configure OpenSSL for {}", target),