History

meson, bootstrap: make bootstrap independent of build dir naming

Sigrid Solveig Haflínudóttir committed 3 months ago

Commit 1fcf5dc1 parent 87aa3092 files · +6 −8Browse files

Showing the changes to tools (1 of 2 files). Show all

Unified · Split

tools/bootstrap.sh+4−6
@@ -1,18 +1,16 @@
11 #!/bin/sh
22 set -x
3−test -e
43 P="${MESON_SOURCE_ROOT:-$(pwd)}"
54 T="$P/tools"
65 B="${MESON_BUILD_ROOT:-$P/build}"
7−F="$B/sl"
8−test -x "$F" || { echo no "$F" found; exit 1; }
6+test -x "$1" || { echo no "$1" found; exit 1; }
97 cd "$P/src" && \
10−"$F" $* "$T/gen.sl" && \
8+$* "$T/gen.sl" && \
119 cp "$P/boot/sl.boot" "$P/boot/sl.boot.bak" && \
12−"$F" $* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot" && \
10+$* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot" && \
1311 ninja -C "$B" && \
1412 cd "$P/boot" && \
15−"$F" $* "$T/mkboot1.sl" && \
13+$* "$T/mkboot1.sl" && \
1614 sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \
1715 mv sl.boot.cut sl.boot && \
1816 ninja -C "$B" || { cp "$P/boot/sl.boot.bak" "$P/boot/sl.boot"; exit 1; }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t