diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-20 15:32:47 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-22 10:29:56 -0800 |
| commit | d56999aef9199943c79793637c525fbff6c92a8d (patch) | |
| tree | faf8f0fda4da3affb2cd860db1e859dec37f2bbb /src/ci | |
| parent | c2a0d1ba112d94e48d5292bde272de7904c66fff (diff) | |
| download | rust-d56999aef9199943c79793637c525fbff6c92a8d.tar.gz rust-d56999aef9199943c79793637c525fbff6c92a8d.zip | |
travis: Enable testing i686 musl
This fixes the final issues with the target related to unwinding by disabling removal of frame pointers.
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/linux-tested-targets/Dockerfile | 2 | ||||
| -rw-r--r-- | src/ci/docker/linux-tested-targets/build-musl.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/linux-tested-targets/Dockerfile b/src/ci/docker/linux-tested-targets/Dockerfile index 7f95e17c709..2a43201ed0a 100644 --- a/src/ci/docker/linux-tested-targets/Dockerfile +++ b/src/ci/docker/linux-tested-targets/Dockerfile @@ -32,10 +32,10 @@ ENV RUST_CONFIGURE_ARGS \ --musl-root-x86_64=/musl-x86_64 \ --musl-root-i686=/musl-i686 -# FIXME should also test i686-unknown-linux-musl ENV SCRIPT \ python2.7 ../x.py test \ --target x86_64-unknown-linux-musl \ + --target i686-unknown-linux-musl \ --target i586-unknown-linux-gnu \ && \ python2.7 ../x.py dist \ diff --git a/src/ci/docker/linux-tested-targets/build-musl.sh b/src/ci/docker/linux-tested-targets/build-musl.sh index 2382605f9bd..260dc11509f 100644 --- a/src/ci/docker/linux-tested-targets/build-musl.sh +++ b/src/ci/docker/linux-tested-targets/build-musl.sh @@ -57,7 +57,7 @@ cp lib/libunwind.a /musl-x86_64/lib # for x86_64 again) rm -rf * # for i686 -CFLAGS="$CFLAGS -m32 -g" CXXFLAGS="$CXXFLAGS -m32 -g" cmake ../libunwind-release_37 \ +CFLAGS="$CFLAGS -m32" CXXFLAGS="$CXXFLAGS -m32" cmake ../libunwind-release_37 \ -DLLVM_PATH=/build/llvm-release_37 \ -DLIBUNWIND_ENABLE_SHARED=0 make -j10 |