build: correct MSVC and Windows mixup for CLANG_BUILD_STATIC#183609
Merged
build: correct MSVC and Windows mixup for CLANG_BUILD_STATIC#183609
MSVC and Windows mixup for CLANG_BUILD_STATIC#183609Conversation
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.
Member
|
@llvm/pr-subscribers-clang Author: Saleem Abdulrasool (compnerd) ChangesThe build incorrectly used Full diff: https://github.com/llvm/llvm-project/pull/183609.diff 1 Files Affected:
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
index 4059fc3e986c7..c811b7f459126 100644
--- a/clang/cmake/modules/AddClang.cmake
+++ b/clang/cmake/modules/AddClang.cmake
@@ -108,7 +108,7 @@ macro(add_clang_library name)
endif()
llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})
- if(MSVC AND NOT CLANG_LINK_CLANG_DYLIB)
+ if((WIN32 AND NOT MINGW) AND NOT CLANG_LINK_CLANG_DYLIB)
# Make sure all consumers also turn off visibility macros so they're not
# trying to dllimport symbols.
target_compile_definitions(${name} PUBLIC CLANG_BUILD_STATIC)
|
compnerd
added a commit
to compnerd/llvm-project
that referenced
this pull request
Feb 26, 2026
…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)
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/157/builds/44859 Here is the relevant piece of the build log for the reference |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/95/builds/20206 Here is the relevant piece of the build log for the reference |
sujianIBM
pushed a commit
to sujianIBM/llvm-project
that referenced
this pull request
Mar 5, 2026
…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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The build incorrectly used
MSVCto 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 toWIN32 AND NOT MINGWto correctly identify that we are building for Windows MS ABI.