From 667de236b1573012834e6c4dc06232f5c7617834 Mon Sep 17 00:00:00 2001
From: Owen Voorhees <ovoorhees@apple.com>
Date: Tue, 21 Oct 2025 10:37:14 -0700
Subject: [PATCH] Revert to using OBJROOT as the tmpdir for Windows compiles

---
 Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec    | 4 ++--
 Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec b/Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec
index a362be6e..2945e91a 100644
--- a/Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec
+++ b/Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec
@@ -17,8 +17,8 @@
         Type = Compiler;
         BasedOn = "default:com.apple.compilers.llvm.clang.1_0";
         EnvironmentVariables = {
-            "TEMP" = "$(CACHE_ROOT:default=$(OBJROOT))";
-            "TMP" = "$(CACHE_ROOT:default=$(OBJROOT))";
+            "TEMP" = "$(OBJROOT)";
+            "TMP" = "$(OBJROOT)";
         };
         Name = "Apple LLVM Windows";
         Description = "Apple LLVM Windows compiler";
diff --git a/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift b/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift
index aadbe1ea..1df34302 100644
--- a/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift
+++ b/Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift
@@ -1397,6 +1397,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                         buildConfigurations: [TestBuildConfiguration(
                             "Debug",
                             buildSettings: [
+                                "OBJROOT": tmpDir.join("objroot").str,
                                 "PRODUCT_NAME": "$(TARGET_NAME)",
                                 "CLANG_ENABLE_MODULES": "YES",
                                 "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",
@@ -1419,6 +1420,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
                             buildConfigurations: [TestBuildConfiguration(
                                 "Debug",
                                 buildSettings: [
+                                    "OBJROOT": tmpDir.join("objroot").str,
                                     "PRODUCT_NAME": "$(TARGET_NAME)",
                                     "CLANG_ENABLE_MODULES": "YES",
                                     "_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",