fix(ci): linker conflict in travis
Diff
.travis.yml | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
@@ -9,7 +9,7 @@ matrix:
- env:
- NAME=fwloki
- TARGET=arm-unknown-linux-gnueabihf
- LINKER=arm-linux-gnueabihf-gcc
- CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
- PACKAGE=$NAME-arm.tar.gz
addons:
apt:
@@ -20,7 +20,7 @@ matrix:
- env:
- NAME=fwloki
- TARGET=armv7-unknown-linux-gnueabihf
- LINKER=arm-linux-gnueabihf-gcc
- CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
- PACKAGE=$NAME-armv7.tar.gz
addons:
apt:
@@ -41,13 +41,6 @@ matrix:
install:
- export PATH="$PATH:$HOME/.cargo/bin"
- rustup target add $TARGET || true
- |
if [ -n "$LINKER" ]; then
mkdir -p ~/.cargo
echo >> ~/.cargo/config
echo "[target.$TARGET]" >> ~/.cargo/config
echo "linker = \"$LINKER\"" >> ~/.cargo/config
fi
script:
- |
if [ $TARGET = "x86_64-unknown-linux-gnu" ]; then