summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-01-19 13:47:29 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-01-19 13:47:29 +0100
commit6700479fbe2b35fedc740bea71d071f9b673487a (patch)
tree8da92b1e1db5c59d2aeececfd2c7eb714a16461d
parent86ee85666d000013b84ae01bf580eb90d75455f9 (diff)
downloadmullvadvpn-6700479fbe2b35fedc740bea71d071f9b673487a.tar.xz
mullvadvpn-6700479fbe2b35fedc740bea71d071f9b673487a.zip
Make format.sh work under minGW on Windows, and on stable toolchain
-rwxr-xr-xformat.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/format.sh b/format.sh
index 4bc0eff2d5..8fe6fd7787 100755
--- a/format.sh
+++ b/format.sh
@@ -7,12 +7,11 @@ set -u
VERSION=`grep "required_version" rustfmt.toml | cut -f2 -d'"'`
CMD="rustfmt"
-INSTALL_CMD="cargo install --vers $VERSION --force rustfmt-nightly"
+INSTALL_CMD="cargo +nightly install --vers $VERSION --force rustfmt-nightly"
case "$(uname -s)" in
Linux*) export LD_LIBRARY_PATH=$(rustc +nightly --print sysroot)/lib;;
Darwin*) export DYLD_LIBRARY_PATH=$(rustc +nightly --print sysroot)/lib;;
- *) echo "Unsupported platform"; exit 1
esac
function correct_rustfmt() {