From fd3da3348cfb9f479dab2fa6a846b61b2187f97b Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 28 Oct 2020 16:31:59 -0700
Subject: [PATCH] ci: macos: rebuild zig1.o with stage1

see #6830 for details.
---
 ci/azure/macos_script | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ci/azure/macos_script b/ci/azure/macos_script
index 2b23dd40b..cb14b7f11 100755
--- a/ci/azure/macos_script
+++ b/ci/azure/macos_script
@@ -46,6 +46,13 @@ unset CXX
 unset ZIG_LIBC
 
 make $JOBS install
+
+# Here we rebuild zig but this time using the Zig binary we just now produced to
+# build zig1.o rather than relying on the one built with stage0. See
+# https://github.com/ziglang/zig/issues/6830 for more details.
+cmake .. -DZIG_EXECUTABLE="$(pwd)/release/bin/zig"
+make $JOBS install
+
 release/bin/zig build test
 
 if [ "${BUILD_REASON}" != "PullRequest" ]; then