diff options
| author | bors <bors@rust-lang.org> | 2018-02-10 19:48:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-10 19:48:20 +0000 |
| commit | 45fba43b3d5b4d1944268cf973099bfacb11bf4c (patch) | |
| tree | 60faf17ac0f398109b52b4a99f9094731b7f7bb3 /src/ci | |
| parent | 39abcc04139a0fd24422f422271849dc91e39a88 (diff) | |
| parent | 4a827188cc46d47f75c72dba3a268d5c9f206582 (diff) | |
Auto merge of #48113 - kennytm:rollup, r=kennytm
Rollup of 20 pull requests - Successful merges: #47790, #47835, #47854, #48015, #48047, #48051, #48058, #48059, #48064, #48078, #48080, #48086, #48098, #48101, #48107, #48100, #48085, #48120, #48124, #47547 - Failed merges:
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/dist-i686-linux/Dockerfile | 3 | ||||
| -rwxr-xr-x | src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/docker/dist-i686-linux/Dockerfile b/src/ci/docker/dist-i686-linux/Dockerfile index 0fd6af6e10d..5e405aa72e8 100644 --- a/src/ci/docker/dist-i686-linux/Dockerfile +++ b/src/ci/docker/dist-i686-linux/Dockerfile @@ -86,7 +86,8 @@ ENV RUST_CONFIGURE_ARGS \ --enable-extended \ --enable-sanitizers \ --enable-profiler \ - --enable-emscripten + --enable-emscripten \ + --build=i686-unknown-linux-gnu ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS # This is the only builder which will create source tarballs diff --git a/src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh b/src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh index 5b4314d57e6..e730dd86087 100755 --- a/src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh +++ b/src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh @@ -54,7 +54,7 @@ cd usr/src # The options, in order, do the following # * this is an unprivileged build # * output to a predictable location -# * disable various uneeded stuff +# * disable various unneeded stuff MKUNPRIVED=yes TOOLDIR=/x-tools/x86_64-unknown-netbsd \ MKSHARE=no MKDOC=no MKHTML=no MKINFO=no MKKMOD=no MKLINT=no MKMAN=no MKNLS=no MKPROFILE=no \ hide_output ./build.sh -j10 -m amd64 tools |