From a98635a51f46f6dc2692cbdd672016aa27cb7fc7 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Fri, 24 Jul 2026 12:43:47 -0500 Subject: [PATCH] Use environ to set PlatformToolset for Windows Clang builder --- master/custom/factories.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index e186ad91..ba78723d 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -621,6 +621,7 @@ class MacOSAsanNoGilBuild(UnixAsanNoGilBuild): class BaseWindowsBuild(BaseBuild): build_command = [r"Tools\buildbot\build.bat"] + compile_environ = {} test_command = [r"Tools\buildbot\test.bat"] clean_command = [r"Tools\buildbot\clean.bat"] python_command = [r"python.bat"] @@ -643,7 +644,10 @@ def setup(self, branch, worker, **kwargs): *self.cleanFlags, *get_j_opts(worker), ] - self.addStep(Compile(command=build_command)) + self.addStep(Compile( + command=build_command, + env=self.compile_environ, + )) self.addStep(PythonInfo( command=self.python_command + ["-m", "test.pythoninfo"], )) @@ -681,7 +685,9 @@ class Windows64Build(BaseWindowsBuild): class Windows64ClangBuild(Windows64Build): - buildFlags = [*Windows64Build.buildFlags, '"/p:PlatformToolset=ClangCL"'] + compile_environ = { + "PlatformToolset": "ClangCL", + } factory_tags = [*Windows64Build.factory_tags, 'clang']