From 021e0ab070d2218f1a8f7be497a7e0289d43ad0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Wed, 9 Sep 2026 13:55:42 +0200 Subject: [PATCH] ci: consistently pass -Dcpu=$MCPU along with -Dtarget=$TARGET --- ci/aarch64-freebsd-debug.sh | 1 + ci/aarch64-freebsd-release.sh | 1 + ci/aarch64-linux-debug.sh | 1 + ci/aarch64-linux-release.sh | 1 + ci/aarch64-macos-debug.sh | 1 + ci/aarch64-macos-release.sh | 1 + ci/aarch64-netbsd-debug.sh | 1 + ci/aarch64-netbsd-release.sh | 1 + ci/aarch64-openbsd-debug.sh | 1 + ci/aarch64-openbsd-release.sh | 1 + ci/aarch64-windows-release.ps1 | 1 + ci/loongarch64-linux-debug.sh | 1 + ci/loongarch64-linux-release.sh | 1 + ci/riscv64-linux-debug.sh | 1 + ci/riscv64-linux-release.sh | 1 + ci/x86_64-freebsd-debug.sh | 1 + ci/x86_64-freebsd-release.sh | 1 + ci/x86_64-linux-debug-llvm.sh | 1 + ci/x86_64-linux-debug.sh | 1 + ci/x86_64-linux-release.sh | 1 + ci/x86_64-netbsd-debug.sh | 1 + ci/x86_64-netbsd-release.sh | 1 + ci/x86_64-openbsd-debug.sh | 1 + ci/x86_64-openbsd-release.sh | 1 + ci/x86_64-windows-release.ps1 | 1 + 25 files changed, 25 insertions(+) diff --git a/ci/aarch64-freebsd-debug.sh b/ci/aarch64-freebsd-debug.sh index 71587595e766c031cc3ed50318637402020b24f2..b477fdb8d5c7efc35602b300ac08ef7d13078bc9 100755 --- a/ci/aarch64-freebsd-debug.sh +++ b/ci/aarch64-freebsd-debug.sh @@ -57,6 +57,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/aarch64-freebsd-release.sh b/ci/aarch64-freebsd-release.sh index 5305c3d81bead6815a24b44839e7a3348a0e7761..01836b0297090393f20868b60316a1f6978d1b6a 100755 --- a/ci/aarch64-freebsd-release.sh +++ b/ci/aarch64-freebsd-release.sh @@ -60,6 +60,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/aarch64-linux-debug.sh b/ci/aarch64-linux-debug.sh index 352184a2c1599bdd8ed657760440f571e8633a83..ae4fe411babde0c11ffbb33ca38bda07effc31af 100755 --- a/ci/aarch64-linux-debug.sh +++ b/ci/aarch64-linux-debug.sh @@ -59,6 +59,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/aarch64-linux-release.sh b/ci/aarch64-linux-release.sh index c60d6f1f903767b9fa47b894562047fe10322e2d..41c12c881f648118a5430ab0340f905546c0a0ec 100755 --- a/ci/aarch64-linux-release.sh +++ b/ci/aarch64-linux-release.sh @@ -62,6 +62,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/aarch64-macos-debug.sh b/ci/aarch64-macos-debug.sh index 635dc8955eedc8d981e93552a8716ac41f41e4ce..9ea978f50989ee196865c35aa79d003b9b81d6ed 100755 --- a/ci/aarch64-macos-debug.sh +++ b/ci/aarch64-macos-debug.sh @@ -66,6 +66,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/aarch64-macos-release.sh b/ci/aarch64-macos-release.sh index b1d7c9cba2f4391d1e5a6e97dcc261fa6b86a813..99ebf2ddec8e106e99ff1a75a5683693d59caa4e 100755 --- a/ci/aarch64-macos-release.sh +++ b/ci/aarch64-macos-release.sh @@ -73,6 +73,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/aarch64-netbsd-debug.sh b/ci/aarch64-netbsd-debug.sh index d275f3b19721ea3f1aa628460a5f427bb846eb33..846f439cc5afa686187a3f90fb4d4dcec1feca51 100755 --- a/ci/aarch64-netbsd-debug.sh +++ b/ci/aarch64-netbsd-debug.sh @@ -57,6 +57,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/aarch64-netbsd-release.sh b/ci/aarch64-netbsd-release.sh index 49d51c00476318a1a2769794f74fcb0f512bf536..b9d0d72c9cdd7b976b4bdad681ae6670534083b0 100755 --- a/ci/aarch64-netbsd-release.sh +++ b/ci/aarch64-netbsd-release.sh @@ -60,6 +60,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/aarch64-openbsd-debug.sh b/ci/aarch64-openbsd-debug.sh index 74808aa44a054f1838e0226739db8cdc8781fe93..af1230da9fc7bb2329d171e08d1baff9ddf970fb 100755 --- a/ci/aarch64-openbsd-debug.sh +++ b/ci/aarch64-openbsd-debug.sh @@ -57,6 +57,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/aarch64-openbsd-release.sh b/ci/aarch64-openbsd-release.sh index 00da968e3501080d4295a8bbd0437ad4e250b406..5b1d78ad79bc084492ee2cc9a58b3fb4c3d64cab 100755 --- a/ci/aarch64-openbsd-release.sh +++ b/ci/aarch64-openbsd-release.sh @@ -65,6 +65,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/aarch64-windows-release.ps1 b/ci/aarch64-windows-release.ps1 index 6db16d463b66a0ab7da1b3f3674a1c93f8cd0ba8..210ff4a9c708195706a120770e8da086b0ef6c24 100644 --- a/ci/aarch64-windows-release.ps1 +++ b/ci/aarch64-windows-release.ps1 @@ -73,6 +73,7 @@ stage3-release\bin\zig.exe build ` -Doptimize=ReleaseFast ` -Dstrip ` -Dtarget="$TARGET" ` + -Dcpu="$MCPU" ` -Duse-zig-libcxx ` -Dversion-string="$(stage3-release\bin\zig version)" CheckLastExitCode diff --git a/ci/loongarch64-linux-debug.sh b/ci/loongarch64-linux-debug.sh index 5f2755dc194d566f77cf8646a21070815003673e..facda56ea7f24a123c5317c0f97a9ca385629338 100755 --- a/ci/loongarch64-linux-debug.sh +++ b/ci/loongarch64-linux-debug.sh @@ -59,6 +59,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/loongarch64-linux-release.sh b/ci/loongarch64-linux-release.sh index 62517fd21199245c9384d1f0882d52ff2c9aed9f..61653f6fd242e040f7ec6e3fd26960bf8e16b124 100755 --- a/ci/loongarch64-linux-release.sh +++ b/ci/loongarch64-linux-release.sh @@ -62,6 +62,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/riscv64-linux-debug.sh b/ci/riscv64-linux-debug.sh index ccdaf7158e50af43bb50d5a358f226371b919cb1..66e03b3f730c8a7eeb91f4add3ac72669175d62e 100755 --- a/ci/riscv64-linux-debug.sh +++ b/ci/riscv64-linux-debug.sh @@ -59,6 +59,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/riscv64-linux-release.sh b/ci/riscv64-linux-release.sh index 453764d4de145995a0dc51ba248576b1693646af..994d48f25f12a41f328cb98be1eecb7cdde5f85b 100755 --- a/ci/riscv64-linux-release.sh +++ b/ci/riscv64-linux-release.sh @@ -62,6 +62,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/x86_64-freebsd-debug.sh b/ci/x86_64-freebsd-debug.sh index 5ba7279812bd55026625bc34df353fd6046a0e00..24df6caf49cfe1342855f52277f1e52faa2633b1 100755 --- a/ci/x86_64-freebsd-debug.sh +++ b/ci/x86_64-freebsd-debug.sh @@ -57,6 +57,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/x86_64-freebsd-release.sh b/ci/x86_64-freebsd-release.sh index 064c72958313f10298b831fe16a5f364c7a78a33..eed9cdc982a80a9162aac1a1fa87ef6d4b246264 100755 --- a/ci/x86_64-freebsd-release.sh +++ b/ci/x86_64-freebsd-release.sh @@ -64,6 +64,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/x86_64-linux-debug-llvm.sh b/ci/x86_64-linux-debug-llvm.sh index 6c0aa530bceba76e3dc181d7c9ec627d06559037..69015c03e866d5fb2a62d7e7a140958c6e588f7d 100755 --- a/ci/x86_64-linux-debug-llvm.sh +++ b/ci/x86_64-linux-debug-llvm.sh @@ -75,6 +75,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh index 67198cea42a252db48b3254e7dd6b3d6a1439ab3..b88f98b59765fe24ba2d773e0a35516508f14280 100755 --- a/ci/x86_64-linux-debug.sh +++ b/ci/x86_64-linux-debug.sh @@ -74,6 +74,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/x86_64-linux-release.sh b/ci/x86_64-linux-release.sh index 61a9354ad6e9b4a9a6d8e191e75b6c0dbce7b79e..249bd7ce17cfbbc8130d3fbc72adf2b9ed59e02c 100755 --- a/ci/x86_64-linux-release.sh +++ b/ci/x86_64-linux-release.sh @@ -84,6 +84,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/x86_64-netbsd-debug.sh b/ci/x86_64-netbsd-debug.sh index c463dcf3c2a92939dcbf7d98e8f095a05fbbd6b7..4eeb9b39427c9247539d6836785f66e548fd42e4 100755 --- a/ci/x86_64-netbsd-debug.sh +++ b/ci/x86_64-netbsd-debug.sh @@ -57,6 +57,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/x86_64-netbsd-release.sh b/ci/x86_64-netbsd-release.sh index b78b6646179ffcab4de402e2f3bd2b64764b5c9f..a283127f6179c13cabcc7c2aebf6f0bddc9d54c6 100755 --- a/ci/x86_64-netbsd-release.sh +++ b/ci/x86_64-netbsd-release.sh @@ -64,6 +64,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/x86_64-openbsd-debug.sh b/ci/x86_64-openbsd-debug.sh index b51b93e8adf0376ad8dd14364a0ace3d859e4e28..4b0dfba7549d64098b9d3bd3a3f5c44b84218ebf 100755 --- a/ci/x86_64-openbsd-debug.sh +++ b/ci/x86_64-openbsd-debug.sh @@ -57,6 +57,7 @@ stage3-debug/bin/zig build \ -Denable-llvm \ -Dno-lib \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-debug/bin/zig version)" diff --git a/ci/x86_64-openbsd-release.sh b/ci/x86_64-openbsd-release.sh index 58e1d7bfbab0b0488d03f515e7f4823bfc892660..fc39f5b3473dcfdd808c58cd91a4f3aaf59053fd 100755 --- a/ci/x86_64-openbsd-release.sh +++ b/ci/x86_64-openbsd-release.sh @@ -65,6 +65,7 @@ stage3-release/bin/zig build \ -Doptimize=ReleaseFast \ -Dstrip \ -Dtarget=$TARGET \ + -Dcpu=$MCPU \ -Duse-zig-libcxx \ -Dversion-string="$(stage3-release/bin/zig version)" diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 3a2ae878699e3c4108471dadf309866fa59fd757..af0e2c7f072602e5d65e408b38a8e9ec9ee4da91 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -73,6 +73,7 @@ stage3-release\bin\zig.exe build ` -Doptimize=ReleaseFast ` -Dstrip ` -Dtarget="$TARGET" ` + -Dcpu="$MCPU" ` -Duse-zig-libcxx ` -Dversion-string="$(stage3-release\bin\zig version)" CheckLastExitCode -- 2.54.0