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

Commit 4bfb5bb

Browse files
author
Jorge Aparicio
committed
Merge pull request #49 from japaric/musl32
add i686-unknown-linux-musl target
2 parents fdebc23 + 687a355 commit 4bfb5bb

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ matrix:
5858
packages: &i686_unknown_linux_gnu
5959
# Cross compiler and cross compiled C libraries
6060
- gcc-multilib
61+
- os: linux
62+
rust: stable
63+
env: TARGET=i686-unknown-linux-musl
6164
- os: osx
6265
rust: stable
6366
env: TARGET=x86_64-apple-darwin
@@ -93,6 +96,9 @@ matrix:
9396
addons:
9497
apt:
9598
packages: *i686_unknown_linux_gnu
99+
- os: linux
100+
rust: beta
101+
env: TARGET=i686-unknown-linux-musl
96102
- os: osx
97103
rust: beta
98104
env: TARGET=x86_64-apple-darwin
@@ -128,6 +134,9 @@ matrix:
128134
addons:
129135
apt:
130136
packages: *i686_unknown_linux_gnu
137+
- os: linux
138+
rust: nightly
139+
env: TARGET=i686-unknown-linux-musl
131140
- os: osx
132141
rust: nightly
133142
env: TARGET=x86_64-apple-darwin
@@ -137,6 +146,14 @@ matrix:
137146
- os: linux
138147
rust: nightly
139148
env: TARGET=x86_64-unknown-linux-musl
149+
allow_failures:
150+
# Target `i686-unknown-linux-musl` is currently only available on the nightly channel
151+
- os: linux
152+
rust: stable
153+
env: TARGET=i686-unknown-linux-musl
154+
- os: linux
155+
rust: beta
156+
env: TARGET=i686-unknown-linux-musl
140157

141158
before_install:
142159
- export PATH="$PATH:$HOME/.cargo/bin"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ executed using qemu user emulation, but this approach has problems when too many
3232
- `i686-pc-windows-gnu` (32-bit Windows, MinGW)
3333
- `i686-pc-windows-msvc` (32-bit Windows, MSVC)
3434
- `i686-unknown-linux-gnu` (32-bit Linux)
35+
- `i686-unknown-linux-musl`. (32-bit Linux, statically linked binaries)
3536
- `x86_64-apple-darwin` (64-bit OSX)
3637
- `x86_64-pc-windows-gnu` (64-bit Windows, MinGW)
3738
- `x86_64-pc-windows-msvc` (64-bit Windows, MSVC)

ci/utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ architecture() {
4343
x86_64-unknown-linux-gnu|x86_64-unknown-linux-musl)
4444
echo amd64
4545
;;
46-
i686-unknown-linux-gnu)
46+
i686-unknown-linux-gnu|i686-unknown-linux-musl)
4747
echo i386
4848
;;
4949
arm*-unknown-linux-gnueabihf)

0 commit comments

Comments
 (0)