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 @@
1#!/bin/sh1#!/bin/sh
2set -x2set -x
3test -e
4P="${MESON_SOURCE_ROOT:-$(pwd)}"3P="${MESON_SOURCE_ROOT:-$(pwd)}"
5T="$P/tools"4T="$P/tools"
6B="${MESON_BUILD_ROOT:-$P/build}"5B="${MESON_BUILD_ROOT:-$P/build}"
7F="$B/sl"6test -x "$1" || { echo no "$1" found; exit 1; }
8test -x "$F" || { echo no "$F" found; exit 1; }
9cd "$P/src" && \7cd "$P/src" && \
10"$F" $* "$T/gen.sl" && \8$* "$T/gen.sl" && \
11cp "$P/boot/sl.boot" "$P/boot/sl.boot.bak" && \9cp "$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" && \
13ninja -C "$B" && \11ninja -C "$B" && \
14cd "$P/boot" && \12cd "$P/boot" && \
15"$F" $* "$T/mkboot1.sl" && \13$* "$T/mkboot1.sl" && \
16sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \14sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \
17mv sl.boot.cut sl.boot && \15mv sl.boot.cut sl.boot && \
18ninja -C "$B" || { cp "$P/boot/sl.boot.bak" "$P/boot/sl.boot"; exit 1; }16ninja -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