~doyle/fwloki.git

author	Jordan Doyle <jordan@doyle.la>	2020-05-24 17:39:18.0 +01:00:00
committer	Jordan Doyle <jordan@doyle.la>	2020-05-24 17:39:18.0 +01:00:00
commit	b4a71294c9f6e9d4fa3e9600216b172ec54e6267 [patch]
tree	49691d39bc76a69bac485c0807d4722e778d061a
parent	9117f3cfe01164ba5f630f978404ebebf78dbbb4
download	b4a71294c9f6e9d4fa3e9600216b172ec54e6267.tar.gz

fix(ci): linker conflict in travis

Diff

 .travis.yml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ca4673f..7d63e4c 100644
--- a/.travis.yml
+++ a/.travis.yml
@@ -9,7 +9,7 @@
    - 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 @@
    - 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 @@
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