Unified · Split
| @@ -729,7 +729,7 @@ test('docvet.sl', sl, args: ta+['docvet.sl'], workdir: src_dir/'tools', is_paral · 728 unmodified lines | ||
| 729 | 729 | bootstrap = src_dir/'tools'/'bootstrap.sh' |
| 730 | 730 | run_target( |
| 731 | 731 | 'bootstrap', |
| 732 | − command: bootstrap, | |
| 732 | + command: [bootstrap, sl]+ta, | |
| 733 | 733 | ) |
| 734 | 734 | |
| 735 | 735 | if not meson.is_cross_build() |
| @@ -738,7 +738,7 @@ if not meson.is_cross_build() · 2 unmodified lines | ||
| 738 | 738 | native: true, |
| 739 | 739 | required: true, |
| 740 | 740 | ) |
| 741 | − test('bootstrap', bootstrap, args: ta, workdir: src_dir, is_parallel: false, priority: 9999, timeout: -1) | |
| 741 | + test('bootstrap', bootstrap, workdir: src_dir, is_parallel: false, priority: 9999, timeout: -1) | |
| 742 | 742 | endif |
| 743 | 743 | |
| 744 | 744 | summary( |
| @@ -1,18 +1,16 @@ | ||
| 1 | 1 | #!/bin/sh |
| 2 | 2 | set -x |
| 3 | −test -e | |
| 4 | 3 | P="${MESON_SOURCE_ROOT:-$(pwd)}" |
| 5 | 4 | T="$P/tools" |
| 6 | 5 | 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; } | |
| 9 | 7 | cd "$P/src" && \ |
| 10 | −"$F" $* "$T/gen.sl" && \ | |
| 8 | +$* "$T/gen.sl" && \ | |
| 11 | 9 | 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" && \ | |
| 13 | 11 | ninja -C "$B" && \ |
| 14 | 12 | cd "$P/boot" && \ |
| 15 | −"$F" $* "$T/mkboot1.sl" && \ | |
| 13 | +$* "$T/mkboot1.sl" && \ | |
| 16 | 14 | sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \ |
| 17 | 15 | mv sl.boot.cut sl.boot && \ |
| 18 | 16 | ninja -C "$B" || { cp "$P/boot/sl.boot.bak" "$P/boot/sl.boot"; exit 1; } |