Skip to content
This repository has been archived by the owner on Dec 9, 2018. It is now read-only.

Commit

Permalink
Merge pull request #49 from japaric/musl32
Browse files Browse the repository at this point in the history
add i686-unknown-linux-musl target
  • Loading branch information
Jorge Aparicio committed May 21, 2016
2 parents fdebc23 + 687a355 commit 4bfb5bb
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ matrix:
packages: &i686_unknown_linux_gnu
# Cross compiler and cross compiled C libraries
- gcc-multilib
- os: linux
rust: stable
env: TARGET=i686-unknown-linux-musl
- os: osx
rust: stable
env: TARGET=x86_64-apple-darwin
Expand Down Expand Up @@ -93,6 +96,9 @@ matrix:
addons:
apt:
packages: *i686_unknown_linux_gnu
- os: linux
rust: beta
env: TARGET=i686-unknown-linux-musl
- os: osx
rust: beta
env: TARGET=x86_64-apple-darwin
Expand Down Expand Up @@ -128,6 +134,9 @@ matrix:
addons:
apt:
packages: *i686_unknown_linux_gnu
- os: linux
rust: nightly
env: TARGET=i686-unknown-linux-musl
- os: osx
rust: nightly
env: TARGET=x86_64-apple-darwin
Expand All @@ -137,6 +146,14 @@ matrix:
- os: linux
rust: nightly
env: TARGET=x86_64-unknown-linux-musl
allow_failures:
# Target `i686-unknown-linux-musl` is currently only available on the nightly channel
- os: linux
rust: stable
env: TARGET=i686-unknown-linux-musl
- os: linux
rust: beta
env: TARGET=i686-unknown-linux-musl

before_install:
- export PATH="$PATH:$HOME/.cargo/bin"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ executed using qemu user emulation, but this approach has problems when too many
- `i686-pc-windows-gnu` (32-bit Windows, MinGW)
- `i686-pc-windows-msvc` (32-bit Windows, MSVC)
- `i686-unknown-linux-gnu` (32-bit Linux)
- `i686-unknown-linux-musl`. (32-bit Linux, statically linked binaries)
- `x86_64-apple-darwin` (64-bit OSX)
- `x86_64-pc-windows-gnu` (64-bit Windows, MinGW)
- `x86_64-pc-windows-msvc` (64-bit Windows, MSVC)
Expand Down
2 changes: 1 addition & 1 deletion ci/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ architecture() {
x86_64-unknown-linux-gnu|x86_64-unknown-linux-musl)
echo amd64
;;
i686-unknown-linux-gnu)
i686-unknown-linux-gnu|i686-unknown-linux-musl)
echo i386
;;
arm*-unknown-linux-gnueabihf)
Expand Down

0 comments on commit 4bfb5bb

Please sign in to comment.