1
Fork 0

step22, llvm16

This commit is contained in:
Motiejus Jakštys 2024-11-09 17:03:42 +02:00
parent 36d2e68f52
commit 902c9b1390
1 changed files with 62 additions and 19 deletions

79
run
View File

@ -6,7 +6,7 @@ fullbuild() {
rm -fr build rm -fr build
mkdir build mkdir build
pushd build pushd build
CC=clang-15 CXX=clang++-15 cmake .. CC=clang-$1 CXX=clang++-$1 cmake ..
make -j"$(nproc)" install make -j"$(nproc)" install
popd popd
} }
@ -17,7 +17,7 @@ halfbuild() {
rm -fr build rm -fr build
mkdir build mkdir build
pushd build pushd build
CC=clang-15 CXX=clang++-15 cmake .. CC=clang-$1 CXX=clang++-$1 cmake ..
make -j"$(nproc)" make -j"$(nproc)"
popd popd
} }
@ -65,7 +65,7 @@ step00() {
git checkout $STEP00_C~1 build.zig CMakeLists.txt git checkout $STEP00_C~1 build.zig CMakeLists.txt
echo "Building the C++ (stage1) implementation" echo "Building the C++ (stage1) implementation"
fullbuild fullbuild 15
echo "C++ implementation in build/stage3/bin/zig. Will build zig1.wasm.zst." echo "C++ implementation in build/stage3/bin/zig. Will build zig1.wasm.zst."
@ -76,7 +76,7 @@ step00() {
echo "stage1/zig1.wasm.zst built. Bootstrapping zig with it." echo "stage1/zig1.wasm.zst built. Bootstrapping zig with it."
fullbuild fullbuild 15
echo "Zig bootstrapped from selfhosted." echo "Zig bootstrapped from selfhosted."
} }
@ -99,7 +99,7 @@ step01() {
pushd "../zig-$STEP01_" pushd "../zig-$STEP01_"
cp "$OLDPWD/stage1/zig1.wasm.zst" stage1/ cp "$OLDPWD/stage1/zig1.wasm.zst" stage1/
patch -p1 <"$HERE/0.10.0-675-g9d93b2ccf1-TypeOf-hack.patch" patch -p1 <"$HERE/0.10.0-675-g9d93b2ccf1-TypeOf-hack.patch"
fullbuild fullbuild 15
build/stage3/bin/zig build update-zig1 build/stage3/bin/zig build update-zig1
popd popd
} }
@ -124,7 +124,7 @@ step02() {
{ {
pushd "../zig-$STEP02_" pushd "../zig-$STEP02_"
zstd -cd ../zig-$STEP01_/stage1/zig1.wasm.zst >stage1/zig1.wasm zstd -cd ../zig-$STEP01_/stage1/zig1.wasm.zst >stage1/zig1.wasm
fullbuild fullbuild 15
build/stage3/bin/zig build update-zig1 build/stage3/bin/zig build update-zig1
popd popd
} }
@ -165,7 +165,7 @@ step04() {
{ {
pushd "../zig-$STEP04_" pushd "../zig-$STEP04_"
cp ../zig-$STEP03_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP03_/stage1/zig1.wasm stage1/zig1.wasm
fullbuild fullbuild 15
build/stage3/bin/zig build update-zig1 build/stage3/bin/zig build update-zig1
popd popd
} }
@ -185,7 +185,7 @@ step05() {
{ {
pushd "../zig-$STEP05_" pushd "../zig-$STEP05_"
cp ../zig-$STEP04_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP04_/stage1/zig1.wasm stage1/zig1.wasm
fullbuild fullbuild 15
popd popd
} }
} }
@ -222,7 +222,7 @@ step07() {
{ {
pushd "../zig-$STEP07_" pushd "../zig-$STEP07_"
cp ../zig-$STEP06_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP06_/stage1/zig1.wasm stage1/zig1.wasm
halfbuild halfbuild 15
popd popd
} }
} }
@ -259,7 +259,7 @@ step09() {
{ {
pushd "../zig-$STEP09_" pushd "../zig-$STEP09_"
cp ../zig-$STEP08_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP08_/stage1/zig1.wasm stage1/zig1.wasm
fullbuild fullbuild 15
popd popd
} }
} }
@ -279,7 +279,7 @@ step10() {
{ {
pushd "../zig-$STEP10_" pushd "../zig-$STEP10_"
../zig-$STEP09_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1 ../zig-$STEP09_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
fullbuild fullbuild 15
popd popd
} }
} }
@ -298,7 +298,7 @@ step11() {
{ {
pushd "../zig-$STEP11_" pushd "../zig-$STEP11_"
../zig-$STEP10_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1 ../zig-$STEP10_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
fullbuild fullbuild 15
popd popd
} }
} }
@ -320,7 +320,7 @@ step12() {
{ {
pushd "../zig-$STEP12_" pushd "../zig-$STEP12_"
cp ../zig-$STEP11_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP11_/stage1/zig1.wasm stage1/zig1.wasm
fullbuild fullbuild 15
build/stage3/bin/zig build --zig-lib-dir lib update-zig1 build/stage3/bin/zig build --zig-lib-dir lib update-zig1
popd popd
} }
@ -344,7 +344,7 @@ step13() {
pushd "../zig-$STEP13_" pushd "../zig-$STEP13_"
patch -p1 <"$HERE/0.10.0-1638-g7199d7c777-re-add-qualCast.patch" patch -p1 <"$HERE/0.10.0-1638-g7199d7c777-re-add-qualCast.patch"
../zig-$STEP12_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1 ../zig-$STEP12_/build/stage3/bin/zig build --zig-lib-dir lib update-zig1
fullbuild fullbuild 15
popd popd
} }
} }
@ -363,7 +363,7 @@ step14() {
{ {
pushd "../zig-$STEP14_" pushd "../zig-$STEP14_"
cp ../zig-$STEP13_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP13_/stage1/zig1.wasm stage1/zig1.wasm
halfbuild halfbuild 15
popd popd
} }
} }
@ -401,7 +401,7 @@ step16() {
{ {
pushd "../zig-$STEP16_" pushd "../zig-$STEP16_"
cp ../zig-$STEP15_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP15_/stage1/zig1.wasm stage1/zig1.wasm
halfbuild halfbuild 15
popd popd
} }
} }
@ -438,7 +438,7 @@ step18() {
{ {
pushd "../zig-$STEP18_" pushd "../zig-$STEP18_"
cp ../zig-$STEP17_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP17_/stage1/zig1.wasm stage1/zig1.wasm
halfbuild halfbuild 15
popd popd
} }
} }
@ -478,11 +478,52 @@ step20() {
{ {
pushd "../zig-$STEP20_" pushd "../zig-$STEP20_"
cp ../zig-$STEP19_/stage1/zig1.wasm stage1/zig1.wasm cp ../zig-$STEP19_/stage1/zig1.wasm stage1/zig1.wasm
halfbuild halfbuild 16
popd popd
} }
} }
# commit d3a237a98c5a2ccf72a774b5f93425c02fea4bea
# Merge: 1728d92f60 3c3cee2cfa
# Author: Andrew Kelley <andrew@ziglang.org>
# Date: 2023-04-11T18:54:43+03:00
#
# Merge pull request #15234 from ziglang/remove-legacy-build-api
#
# remove --enable-cache option; std.Build.CompileStep: remove output_dir
#
STEP21=d3a237a98c5a2ccf72a774b5f93425c02fea4bea
STEP21_=0.10.0-2558-gd3a237a98c
step21() {
rm -fr "../zig-$STEP21_"
git archive --prefix=zig-$STEP21_/ $STEP21 | tar -C .. -x
{
pushd "../zig-$STEP21_"
cp ../zig-$STEP20_/stage1/zig1.wasm stage1/zig1.wasm
halfbuild 16
popd
}
}
# commit e2fe1907ecac075e4d4a37776359144318b6055a
# Author: Andrew Kelley <andrew@ziglang.org>
# Date: 2023-04-13T07:03:36+03:00
#
# add c_char type
#
STEP22=e2fe1907ecac075e4d4a37776359144318b6055a
STEP22_=0.10.0-2566-ge2fe1907ec
step22() {
rm -fr "../zig-$STEP22_"
git archive --prefix=zig-$STEP22_/ $STEP22 | tar -C .. -x
git archive --prefix=zig-$STEP22_/ $STEP22~1 lib/std/start.zig | tar -C .. -x
{
pushd "../zig-$STEP22_"
../zig-$STEP21_/build/zig2 build --zig-lib-dir lib update-zig1
halfbuild 16
popd
}
}
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
set -xeuo pipefail set -xeuo pipefail
@ -511,4 +552,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
if [[ "$step" -le 18 ]]; then step18; fi if [[ "$step" -le 18 ]]; then step18; fi
if [[ "$step" -le 19 ]]; then step19; fi if [[ "$step" -le 19 ]]; then step19; fi
if [[ "$step" -le 20 ]]; then step20; fi if [[ "$step" -le 20 ]]; then step20; fi
if [[ "$step" -le 21 ]]; then step21; fi
if [[ "$step" -le 22 ]]; then step22; fi
fi fi