File tree Expand file tree Collapse file tree 4 files changed +28
-11
lines changed
ansible/roles/dev-desktop/files/scripts Expand file tree Collapse file tree 4 files changed +28
-11
lines changed Original file line number Diff line number Diff line change @@ -7,5 +7,5 @@ echo "new_worktree.sh | creates a worktree (shallow copy of the main git ch
7
7
echo " detach_merged_prs.sh | invokes \" git pull --fast-forward-only\" on all worktrees and detaches those that are equal to the \" master\" branch"
8
8
echo " "
9
9
echo " # Rarer commands:"
10
- echo " set_defaults.sh | connects the global config.toml with all worktrees. Use this when your setup is broken"
11
-
10
+ echo " set_defaults.sh | connects the global config.toml with all worktrees. Use this when your setup is broken"
11
+ echo " setup_rust.sh | Clone your fork of rust-lang/rust, compile, and then link it "
Original file line number Diff line number Diff line change
1
+ #! /usr/bin/env bash
2
+
3
+ # Enable strict mode for Bash
4
+ # http://redsymbol.net/articles/unofficial-bash-strict-mode/
5
+ set -euo pipefail
6
+ IFS=$' \n\t '
7
+
8
+ for D in rust* ; do
9
+ if [ -d " ${D} " ]; then
10
+ pushd " ${D} "
11
+
12
+ ./x.py build
13
+
14
+ if [[ -d " $D /build/aarch64-unknown-linux-gnu/stage1" ]]; then
15
+ rustup toolchain link " $D " _stage1 " $D /build/aarch64-unknown-linux-gnu/stage1"
16
+ fi
17
+
18
+ if [[ -d " $D /build/aarch64-unknown-linux-gnu/stage2" ]]; then
19
+ rustup toolchain link " $D " _stage2 " $D /build/aarch64-unknown-linux-gnu/stage2"
20
+ fi
21
+
22
+ popd
23
+ fi
24
+ done
Original file line number Diff line number Diff line change @@ -13,4 +13,4 @@ git checkout upstream/master
13
13
ln -s ../config.toml
14
14
popd
15
15
16
- setup_rustup .sh
16
+ link_rust .sh
Original file line number Diff line number Diff line change @@ -26,11 +26,4 @@ git checkout upstream/master
26
26
popd
27
27
28
28
set_defaults.sh
29
-
30
- for D in rust* ; do
31
- if [ -d " ${D} " ]; then
32
- cd " ${D} " && ./x.py build
33
- rustup toolchain link " $D " _stage1 " $D /build/x86_64-unknown-linux-gnu/stage1"
34
- rustup toolchain link " $D " _stage2 " $D /build/x86_64-unknown-linux-gnu/stage2"
35
- fi
36
- done
29
+ link_rust.sh
You can’t perform that action at this time.
0 commit comments