History

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
  1. mkfile +4 −6
  2. tools/bootstrap.sh +3 −3
mkfile+4−6
@@ -131,12 +131,10 @@ bootstrap:V: $O.out · 130 unmodified lines
131 cd src && \131 cd src && \
132 ../$O.out ../tools/gen.sl && \132 ../$O.out ../tools/gen.sl && \
133 cp ../boot/sl.boot ../boot/sl.boot.bak && \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 && \134 ../$O.out ../tools/mkboot0.sl builtins.sl instructions.sl system.sl compiler.sl > ../boot/sl.boot.0 && \
135 mv ../boot/sl.boot.new ../boot/sl.boot && \135 cd ../boot && \
136 cd .. && \136 ../$O.out -B sl.boot.0 ../tools/mkboot1.sl && \
137 mk && \137 rm -f sl.boot.0 && \
138 cd boot && \
139 ../$O.out ../tools/mkboot1.sl && \
140 sed 's/^ +//g' <sl.boot >sl.boot.cut && \138 sed 's/^ +//g' <sl.boot >sl.boot.cut && \
141 mv sl.boot.cut sl.boot && \139 mv sl.boot.cut sl.boot && \
142 cd .. && \140 cd .. && \
tools/bootstrap.sh+3−3
@@ -7,10 +7,10 @@ test -x "$1" || { echo no "$1" found; exit 1; } · 6 unmodified lines
7cd "$P/src" && \7cd "$P/src" && \
8$* "$T/gen.sl" && \8$* "$T/gen.sl" && \
9cp "$P/boot/sl.boot" "$P/boot/sl.boot.bak" && \9cp "$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" && \10$* "$T/mkboot0.sl" builtins.sl instructions.sl system.sl compiler.sl > "$P/boot/sl.boot.0" && \
11ninja -C "$B" && \
12cd "$P/boot" && \11cd "$P/boot" && \
13$* "$T/mkboot1.sl" && \12$* -B "$P/boot/sl.boot.0" "$T/mkboot1.sl" && \
13rm -f "$P/boot/sl.boot.0" && \
14sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \14sed -E 's/^ +//g' <sl.boot >sl.boot.cut && \
15echo >>sl.boot.cut &&15echo >>sl.boot.cut &&
16mv sl.boot.cut sl.boot && \16mv sl.boot.cut sl.boot && \

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