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

Unified · Split

2 files

@@ -729,7 +729,7 @@ test('docvet.sl', sl, args: ta+['docvet.sl'], workdir: src_dir/'tools', is_paral · 728 unmodified lines
729	bootstrap = src_dir/'tools'/'bootstrap.sh'	729	bootstrap = src_dir/'tools'/'bootstrap.sh'
730	run_target(	730	run_target(
731	'bootstrap',	731	'bootstrap',
732	command: bootstrap,	732	command: [bootstrap, sl]+ta,
733	)	733	)
734		734
735	if not meson.is_cross_build()	735	if not meson.is_cross_build()
@@ -738,7 +738,7 @@ if not meson.is_cross_build() · 2 unmodified lines
738	native: true,	738	native: true,
739	required: true,	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	endif	742	endif
743		743
744	summary(	744	summary(

 #!/bin/sh
 set -x
-test -e
 P="${MESON_SOURCE_ROOT:-$(pwd)}"
 T="$P/tools"
 B="${MESON_BUILD_ROOT:-$P/build}"
-F="$B/sl"
+test -x "$1" || { echo no "$1" found; exit 1; }
-test -x "$F" || { echo no "$F" found; exit 1; }
 cd "$P/src" && \
-"$F" $* "$T/gen.sl" && \
+$* "$T/gen.sl" && \
 cp "$P/boot/sl.boot" "$P/boot/sl.boot.bak" && \
-"$F" $* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot" && \
+$* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot" && \
 ninja -C "$B" && \
 cd "$P/boot" && \
-"$F" $* "$T/mkboot1.sl" && \
+$* "$T/mkboot1.sl" && \
 sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \
 mv sl.boot.cut sl.boot && \
 ninja -C "$B" || { cp "$P/boot/sl.boot.bak" "$P/boot/sl.boot"; exit 1; }

Keyboard shortcuts