Fix switch to musl target for ARM static binaries

This commit is contained in:
Adrian Calinescu 2018-03-26 09:51:37 +03:00 committed by snobu
parent 7373eb4ed5
commit cd173cfff5
2 changed files with 2 additions and 2 deletions

View file

@ -52,7 +52,7 @@ ENV PATH=/home/rust/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bi
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- -y --default-toolchain $TOOLCHAIN && \ sh -s -- -y --default-toolchain $TOOLCHAIN && \
rustup target add x86_64-unknown-linux-musl && \ rustup target add x86_64-unknown-linux-musl && \
rustup target add armv7-unknown-linux-gnueabihf rustup target add armv7-unknown-linux-musleabihf
ADD cargo-config.toml /home/rust/.cargo/config ADD cargo-config.toml /home/rust/.cargo/config
# Set up a `git credentials` helper for using GH_USER and GH_TOKEN to access # Set up a `git credentials` helper for using GH_USER and GH_TOKEN to access

View file

@ -2,5 +2,5 @@
# Target musl-libc by default when running Cargo. # Target musl-libc by default when running Cargo.
target = "x86_64-unknown-linux-musl" target = "x86_64-unknown-linux-musl"
[target.armv7-unknown-linux-gnueabihf] [target.armv7-unknown-linux-musleabihf]
linker = "arm-linux-gnueabihf-gcc-4.7" linker = "arm-linux-gnueabihf-gcc-4.7"