Merge branch 'master' into benice

This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-07-09 10:50:22 +02:00 committed by GitHub
commit d7887e957c
4 changed files with 5 additions and 5 deletions

@ -1 +1 @@
Subproject commit 94ec3ed902e4e55b1766232d3b0e7d602bc2c472
Subproject commit c4a410b2ca3a6222c7e196c10f258f6e672f31a9

@ -1 +1 @@
Subproject commit 063094b977ce6c415f91e939626f334982c0a0a3
Subproject commit f877a066cda349f8747a8d2de3ca7bcb4603dcfb

@ -1 +1 @@
Subproject commit 64cce208388c10debd5b150de08d9be371bd0e86
Subproject commit 87f3e80b443870ce821f82dd1b3dba5bd66b51b2

View file

@ -1,7 +1,6 @@
#!/bin/bash
set -e
set -v
echo
echo "configuring settings common among OSes"
sudo true
@ -83,10 +82,11 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
cd "$DIR/../"
echo "getting rust sources..."
if [[ ! -d rust ]]; then
git clone https://github.com/rust-lang/rust.git
git clone https://github.com/rust-lang/rust.git --recursive
else
cd rust
git pull
git submodule update --init --recursive
fi
cargo install -f rustfmt