From b29fab151254c0fcea2c31d07730c0a4b913ecfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 28 Jun 2016 22:46:49 +0000 Subject: [PATCH] stylo: Simplify setup_bindgen.sh now that servo/rust-bindgen exists. The clang-3.8 instead of clang++-3.8 check is because on some Linux distros clang++-3.8 doesn't exists, while the former does. --- ports/geckolib/gecko_bindings/tools/setup_bindgen.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh b/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh index 16c4147e9a7..768fb53794d 100755 --- a/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh +++ b/ports/geckolib/gecko_bindings/tools/setup_bindgen.sh @@ -11,7 +11,7 @@ else fi # Make sure we have llvm38. -if [ ! -x "$(command -v clang++-3.8)" ]; then +if [ ! -x "$(command -v clang-3.8)" ]; then echo "llmv38 must be installed. Mac users should |brew install llvm38|, Linux varies by distro." exit 1 fi @@ -27,12 +27,10 @@ fi # Don't try to clone twice. if [ ! -d rust-bindgen ]; then - git clone https://github.com/ecoal95/rust-bindgen.git - cd rust-bindgen - git checkout sm-hacks-rebase-squashed -else - cd rust-bindgen + git clone https://github.com/servo/rust-bindgen.git fi +cd rust-bindgen + multirust override nightly -cargo build +cargo build --features llvm_stable