Skip to content

build: correct MSVC and Windows mixup for CLANG_BUILD_STATIC (#18…#12469

Merged
compnerd merged 1 commit intoswiftlang:stable/21.xfrom
compnerd:static
Feb 27, 2026
Merged

build: correct MSVC and Windows mixup for CLANG_BUILD_STATIC (#18…#12469
compnerd merged 1 commit intoswiftlang:stable/21.xfrom
compnerd:static

Conversation

@compnerd
Copy link
Member

…3609)

The build incorrectly used MSVC to determine that we were building for Windows (MS ABI). This prevents the use of the GNU driver for building LLVM for Windows. Adjust the condition to WIN32 AND NOT MINGW to correctly identify that we are building for Windows MS ABI.

(cherry picked from commit 20ec9a9)

…m#183609)

The build incorrectly used `MSVC` to determine that we were building for
Windows (MS ABI). This prevents the use of the GNU driver for building
LLVM for Windows. Adjust the condition to `WIN32 AND NOT MINGW` to
correctly identify that we are building for Windows MS ABI.

(cherry picked from commit 20ec9a9)
@compnerd compnerd requested a review from a team as a code owner February 26, 2026 23:41
@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd compnerd merged commit 49e0f5a into swiftlang:stable/21.x Feb 27, 2026
3 checks passed
@compnerd compnerd deleted the static branch February 27, 2026 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant