diff --git a/ci/zinc/linux_test.sh b/ci/zinc/linux_test.sh
index 739d85cff0..b0f65aefd3 100755
--- a/ci/zinc/linux_test.sh
+++ b/ci/zinc/linux_test.sh
@@ -48,7 +48,10 @@ cd $WORKSPACE
 $ZIG fmt --check . --exclude test/compile_errors/
 
 # Build stage2 standalone so that we can test stage2 against stage2 compiler-rt.
-$ZIG build -p stage2 -Denable-llvm -Duse-zig-libcxx
+$ZIG             build -p stage2 -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
+
+# Ensure that stage2 can build itself.
+./stage2/bin/zig build -p stage3 -Dstatic-llvm -Dtarget=native-native-musl --search-prefix "$DEPS_LOCAL"
 
 stage2/bin/zig test test/behavior.zig -I test -fLLVM
 stage2/bin/zig test test/behavior.zig -I test -fno-LLVM
@@ -95,8 +98,7 @@ tidy --drop-empty-elements no -qe zig-cache/langref.html
 $ZIG build \
   --prefix "$RELEASE_STAGING" \
   --search-prefix "$DEPS_LOCAL" \
-  -Denable-llvm \
-  -Duse-zig-libcxx \
+  -Dstatic-llvm \
   -Drelease \
   -Dstrip \
   -Dtarget="$TARGET" \
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 6019fc0856..bfe52cd59e 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -1224,6 +1224,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
 
         // This is shared hasher state common to zig source and all C source files.
         cache.hash.addBytes(build_options.version);
+        cache.hash.add(builtin.zig_backend);
         cache.hash.addBytes(options.zig_lib_directory.path orelse ".");
         cache.hash.add(options.optimize_mode);
         cache.hash.add(options.target.cpu.arch);