diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-09 08:47:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 08:47:36 -0500 |
| commit | 116bdacf6bedaba3d9ec83d202e2ca6fa54d8395 (patch) | |
| tree | 1bd748ae2f606c993885ae4160aba23586a471f5 /src | |
| parent | 8f65d7543b12d7789bbf2b3cfa41a683553ec366 (diff) | |
| parent | 499717820d129355bdc3d1b832e0d3e382b6021c (diff) | |
| download | rust-116bdacf6bedaba3d9ec83d202e2ca6fa54d8395.tar.gz rust-116bdacf6bedaba3d9ec83d202e2ca6fa54d8395.zip | |
Rollup merge of #39647 - japaric:sparc, r=alexcrichton
build std for sparc64-unknown-linux-gnu r? @alexcrichton panicking / unwinding is broken (#39646) but with std available at least people will be able to debug that issue on real hardware
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/cross/Dockerfile | 6 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/cross/Dockerfile index 8f947caf2cb..29a5e7bcafb 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/cross/Dockerfile @@ -14,6 +14,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ zlib1g-dev \ g++-arm-linux-gnueabi \ g++-arm-linux-gnueabihf \ + gcc-sparc64-linux-gnu \ + libc6-dev-sparc64-cross \ bzip2 \ patch @@ -60,9 +62,11 @@ ENV TARGETS=$TARGETS,mipsel-unknown-linux-musl ENV TARGETS=$TARGETS,arm-unknown-linux-musleabi ENV TARGETS=$TARGETS,arm-unknown-linux-musleabihf ENV TARGETS=$TARGETS,armv7-unknown-linux-musleabihf +ENV TARGETS=$TARGETS,sparc64-unknown-linux-gnu ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ - CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc + CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ + CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc # Suppress some warnings in the openwrt toolchains we downloaded ENV STAGING_DIR=/tmp diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 0aefe703c9c..2a24edd4e3f 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -78,6 +78,7 @@ static TARGETS: &'static [&'static str] = &[ "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", + "sparc64-unknown-linux-gnu", "wasm32-unknown-emscripten", "x86_64-apple-darwin", "x86_64-apple-ios", |