diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-08-03 00:09:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-03 00:09:04 +0200 |
| commit | a2735a3e0dd58e4b41b933731928678b7a2da700 (patch) | |
| tree | 1ca04796e27afe95746e6a2cd88138337902f77a /src/bootstrap | |
| parent | cf048cc115860cc110865f460f3f2b9b4308ad92 (diff) | |
| parent | 2b0f4483d2f16e6c51a276665bff750fc40c9da9 (diff) | |
| download | rust-a2735a3e0dd58e4b41b933731928678b7a2da700.tar.gz rust-a2735a3e0dd58e4b41b933731928678b7a2da700.zip | |
Rollup merge of #63107 - adrian-budau:master, r=alexcrichton
Added support for armv7-unknown-linux-gnueabi/musleabi Fixes #63101 Some things that are not done and I hope someone can help me with: * During the ci build of `armv7-unknown-linux-gnueabi` `openssl` must be built (to build cargo) but `openssl` does not yet support this target. This feels slightly like a chicken-and-egg problem, any feedback is welcome. * Should I add any tests for any of these targets?
Diffstat (limited to 'src/bootstrap')
| -rwxr-xr-x | src/bootstrap/configure.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py index 907983d43ad..298330869b6 100755 --- a/src/bootstrap/configure.py +++ b/src/bootstrap/configure.py @@ -125,7 +125,9 @@ v("musl-root-armhf", "target.arm-unknown-linux-musleabihf.musl-root", "arm-unknown-linux-musleabihf install directory") v("musl-root-armv5te", "target.armv5te-unknown-linux-musleabi.musl-root", "armv5te-unknown-linux-musleabi install directory") -v("musl-root-armv7", "target.armv7-unknown-linux-musleabihf.musl-root", +v("musl-root-armv7", "target.armv7-unknown-linux-musleabi.musl-root", + "armv7-unknown-linux-musleabi install directory") +v("musl-root-armv7hf", "target.armv7-unknown-linux-musleabihf.musl-root", "armv7-unknown-linux-musleabihf install directory") v("musl-root-aarch64", "target.aarch64-unknown-linux-musl.musl-root", "aarch64-unknown-linux-musl install directory") |