bootstrap: skip one extra rebuild - use -B to point at the temp boot image

Sigrid Solveig Haflínudóttir committed 1 month ago

Commit 7b0202b1 parent 5a405cb2 files · +7 −9Browse files

Unified · Split

2 files

mkfile +4 −6
tools/bootstrap.sh +3 −3

mkfile+4−6

@@ -131,12 +131,10 @@ bootstrap:V: $O.out · 130 unmodified lines
131	131	cd src && \
132	132	../$O.out ../tools/gen.sl && \
133	133	cp ../boot/sl.boot ../boot/sl.boot.bak && \
134		− ../$O.out ../tools/mkboot0.sl builtins.sl instructions.sl system.sl compiler.sl > ../boot/sl.boot.new && \
135		− mv ../boot/sl.boot.new ../boot/sl.boot && \
136		− cd .. && \
137		− mk && \
138		− cd boot && \
139		− ../$O.out ../tools/mkboot1.sl && \
	134	+ ../$O.out ../tools/mkboot0.sl builtins.sl instructions.sl system.sl compiler.sl > ../boot/sl.boot.0 && \
	135	+ cd ../boot && \
	136	+ ../$O.out -B sl.boot.0 ../tools/mkboot1.sl && \
	137	+ rm -f sl.boot.0 && \
140	138	sed 's/^ +//g' <sl.boot >sl.boot.cut && \
141	139	mv sl.boot.cut sl.boot && \
142	140	cd .. && \

tools/bootstrap.sh+3−3

@@ -7,10 +7,10 @@ test -x "$1" \|\| { echo no "$1" found; exit 1; } · 6 unmodified lines
7	7	cd "$P/src" && \
8	8	$* "$T/gen.sl" && \
9	9	cp "$P/boot/sl.boot" "$P/boot/sl.boot.bak" && \
10		−$* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot" && \
11		−ninja -C "$B" && \
	10	+$* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot.0" && \
12	11	cd "$P/boot" && \
13		−$* "$T/mkboot1.sl" && \
	12	+$* -B "$P/boot/sl.boot.0" "$T/mkboot1.sl" && \
	13	+rm -f "$P/boot/sl.boot.0" && \
14	14	sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \
15	15	echo >>sl.boot.cut &&
16	16	mv sl.boot.cut sl.boot && \