1
Fork 0

step14 and 15

This commit is contained in:
Motiejus Jakštys 2024-11-08 19:42:10 +02:00
parent 2c374bcace
commit 2050f9ae4c
1 changed files with 51 additions and 1 deletions

52
run
View File

@ -213,7 +213,7 @@ step07() {
patch -p1 <"$HERE/0.10.0-961-g54160e7f6a-CMakeLists.txt-remove-stage3.patch" patch -p1 <"$HERE/0.10.0-961-g54160e7f6a-CMakeLists.txt-remove-stage3.patch"
cp ../zig-$STEP06_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP06_/stage1/zig1.wasm stage1/zig1.wasm
# same as "fullbuild", except the make target does not have "install" # same as "fullbuild", but for zig2 only
rm -fr build rm -fr build
mkdir build mkdir build
{ {
@ -348,6 +348,54 @@ step13() {
} }
} }
# commit 321ccbdc525ab0f5862e42378b962c10ec54e4a1
# Author: Andrew Kelley <andrew@ziglang.org>
# Date: 2023-02-18T04:54:26+02:00
#
# Sema: implement for_len
#
STEP14=321ccbdc525ab0f5862e42378b962c10ec54e4a1
STEP14_=0.10.0-1657-g321ccbdc52
step14() {
rm -fr "../zig-$STEP14_"
git archive --prefix=zig-$STEP14_/ $STEP14 | tar -C .. -x
{
pushd "../zig-$STEP14_"
patch -p1 <"$HERE/0.10.0-1657-g321ccbdc52-CMakeLists.txt-remove-stage3.patch"
cp ../zig-$STEP13_/stage1/zig1.wasm stage1/zig1.wasm
# same as "fullbuild", but for zig2 only
rm -fr build
mkdir build
{
pushd build
CC=clang-15 CXX=clang++-15 cmake ..
make -j"$(nproc)"
popd
}
popd
}
}
# commit 0bb178bbb2451238a326c6e916ecf38fbc34cab1
# Merge: 346ec15c50 5fc6bbe71e
# Author: Andrew Kelley <andrew@ziglang.org>
# Date: 2023-02-19T17:10:59+02:00
#
# Merge pull request #14671 from ziglang/multi-object-for
#
STEP15=0bb178bbb2451238a326c6e916ecf38fbc34cab1
STEP15_=0.10.0-1681-g0bb178bbb2
step15() {
rm -fr "../zig-$STEP15_"
git archive --prefix=zig-$STEP15_/ $STEP15 | tar -C .. -x
{
pushd "../zig-$STEP15_"
../zig-$STEP14_/build/zig2 build --zig-lib-dir lib update-zig1
popd
}
}
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
set -xeuo pipefail set -xeuo pipefail
step=${1:-step00} step=${1:-step00}
@ -368,4 +416,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "$step" -le 11 ]]; then step11; fi if [[ "$step" -le 11 ]]; then step11; fi
if [[ "$step" -le 12 ]]; then step12; fi if [[ "$step" -le 12 ]]; then step12; fi
if [[ "$step" -le 13 ]]; then step13; fi if [[ "$step" -le 13 ]]; then step13; fi
if [[ "$step" -le 14 ]]; then step14; fi
if [[ "$step" -le 15 ]]; then step15; fi
fi fi