Skip to content

Commit 489e5c5

Browse files
committed
Revert to using OBJROOT as the tmpdir for Windows compiles
1 parent 1fc05a2 commit 489e5c5

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Sources/SWBWindowsPlatform/Specs/WindowsCompile.xcspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Type = Compiler;
1818
BasedOn = "default:com.apple.compilers.llvm.clang.1_0";
1919
EnvironmentVariables = {
20-
"TEMP" = "$(CACHE_ROOT:default=$(OBJROOT))";
21-
"TMP" = "$(CACHE_ROOT:default=$(OBJROOT))";
20+
"TEMP" = "$(OBJROOT)";
21+
"TMP" = "$(OBJROOT)";
2222
};
2323
Name = "Apple LLVM Windows";
2424
Description = "Apple LLVM Windows compiler";

Tests/SWBBuildSystemTests/ClangExplicitModulesTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,6 +1419,7 @@ fileprivate struct ClangExplicitModulesTests: CoreBasedTests {
14191419
buildConfigurations: [TestBuildConfiguration(
14201420
"Debug",
14211421
buildSettings: [
1422+
"OBJROOT": tmpDir.join("objroot").str,
14221423
"PRODUCT_NAME": "$(TARGET_NAME)",
14231424
"CLANG_ENABLE_MODULES": "YES",
14241425
"_EXPERIMENTAL_CLANG_EXPLICIT_MODULES": "YES",

0 commit comments

Comments
 (0)