File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -281,9 +281,10 @@ jobs:
281281
282282 - name : Self-host (mcpp builds mcpp)
283283 run : |
284- MCPP="./target/bootstrap/bin/mcpp"
285- "$MCPP" build
286- SELFHOST=$(find target -path "*/bin/mcpp" -not -path "*/bootstrap/*" | head -1)
284+ # Put bootstrapped mcpp on PATH so build.ninja can find it for dyndep
285+ export PATH="$PWD/target/bootstrap/bin:$PATH"
286+ mcpp build
287+ SELFHOST=$(find target -path "*/bin/mcpp" -not -path "*/bootstrap/*" -not -path "*/build/*" | head -1)
287288 test -x "$SELFHOST"
288289 "$SELFHOST" --version
289290 echo ":: Self-host successful!"
Original file line number Diff line number Diff line change @@ -326,11 +326,11 @@ jobs:
326326
327327 - name : Self-host rebuild (mcpp builds mcpp)
328328 run : |
329- # Now use the bootstrapped mcpp to rebuild itself properly
330- MCPP=". /target/bootstrap/bin/mcpp "
331- "$MCPP" build
329+ # Put bootstrapped mcpp on PATH so build.ninja can find it for dyndep
330+ export PATH="$PWD /target/bootstrap/bin:$PATH "
331+ mcpp build
332332 # Find the self-hosted binary
333- SELFHOST=$(find target -path "*/bin/mcpp" -not -path "*/bootstrap/*" | head -1)
333+ SELFHOST=$(find target -path "*/bin/mcpp" -not -path "*/bootstrap/*" -not -path "*/build/*" | head -1)
334334 test -x "$SELFHOST"
335335 "$SELFHOST" --version
336336 echo "SELFHOST=$SELFHOST" >> "$GITHUB_ENV"
You can’t perform that action at this time.
0 commit comments