diff --git a/Dockerfile b/Dockerfile index ed9bfd0..1086705 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,4 +11,4 @@ RUN apt-get update && \ llvm-15 llvm-15-dev liblld-15-dev lld-15 clang-15 libclang-15-dev \ llvm-16 llvm-16-dev liblld-16-dev lld-16 clang-16 libclang-16-dev \ llvm-17 llvm-17-dev liblld-17-dev lld-17 clang-17 libclang-17-dev \ - llvm-18 llvm-18-dev liblld-18-dev lld-18 clang-18 libclang-18-dev + llvm-18 llvm-18-dev liblld-18-dev lld-18 clang-18 libclang-18-dev libclang-cpp18-dev diff --git a/run b/run index c6d5a80..1e027b4 100755 --- a/run +++ b/run @@ -3,7 +3,6 @@ HERE=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd) fullbuild() { - rm -fr build mkdir build pushd build CC=clang-$1 CXX=clang++-$1 cmake .. @@ -14,7 +13,6 @@ fullbuild() { # zig2 halfbuild() { sed -i '/^add_custom_target(stage3/,/^)$/d' CMakeLists.txt - rm -fr build mkdir build pushd build CC=clang-$1 CXX=clang++-$1 cmake .. @@ -951,10 +949,78 @@ step41() { pushd "../zig-$STEP41_" cp ../zig-$STEP40_/stage1/zig1.wasm stage1/zig1.wasm halfbuild 17 + #build/zig2 build update-zig1 popd } } +# commit 3179f58c414b5e4845b9bf3acdf276fe8e2b88a0 +# Author: Andrew Kelley +# Date: 2023-12-04T21:35:04+02:00 +# +# rename std.zig.CrossTarget to std.Target.Query +# +STEP42=3179f58c414b5e4845b9bf3acdf276fe8e2b88a0 +STEP42_=0.11.0-1886-g3179f58c41 +step42() { + rm -fr "../zig-$STEP42_" + git archive --prefix=zig-$STEP42_/ $STEP42 | tar -C .. -x + { + pushd "../zig-$STEP42_" + ../zig-$STEP41_/build/zig2 build --zig-lib-dir lib update-zig1 + popd + } +} + + +# commit b92e30ff0bd2b77a486451b21d17666a311407f3 +# Author: Andrew Kelley +# Date: 2023-12-06T01:09:07+02:00 +# +# std.Build.ResolvedTarget: rename target field to result +# +STEP43=b92e30ff0bd2b77a486451b21d17666a311407f3 +STEP43_=0.11.0-1894-gb92e30ff0b +step43() { + rm -fr "../zig-$STEP43_" + git archive --prefix=zig-$STEP43_/ $STEP42 | tar -C .. -x + { + pushd "../zig-$STEP43_" + cp ../zig-$STEP41_/stage1/zig1.wasm stage1/zig1.wasm + halfbuild 17 + build/zig2 build update-zig1 + popd + } +} + +# commit 5e2035da145f2c758be26ee9817473b97274c34d +# Author: Andrew Kelley +# Date: 2023-12-25T04:50:20+02:00 +# +# update zig1.wasm +# +# Updates the way CLI parameters for modules and dependencies are +# specified. +# +# Old CLI: --mod a:a,b=c:d --deps a,b=c +# New CLI: --dep a --dep b=c --mod a d +# +STEP44=5e2035da145f2c758be26ee9817473b97274c34d +STEP44_=0.11.0-1972-g5e2035da14 +step44() { + rm -fr "../zig-$STEP44_" + git archive --prefix=zig-$STEP44_/ $STEP44 | tar -C .. -x + { + pushd "../zig-$STEP44_" + cp ../zig-$STEP43_/stage1/zig1.wasm stage1/zig1.wasm + + # ignoring all the fun stuff of zig1's changing command-line arguments. + # build the "new" zig2 by using the "old" zig1 and the old Makefile! + cp ../zig-$STEP43_/CMakeLists.txt . + halfbuild 17 + popd + } +} if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then @@ -1005,4 +1071,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if [[ "$step" -le 39 ]]; then step39; fi if [[ "$step" -le 40 ]]; then step40; fi if [[ "$step" -le 41 ]]; then step41; fi + if [[ "$step" -le 42 ]]; then step42; fi + if [[ "$step" -le 43 ]]; then step43; fi + if [[ "$step" -le 44 ]]; then step44; fi fi