[llvm] cc7a18c - Set Support system_libs if WIN32, not just MSVC or MINGW (#95505)

via llvm-commits llvm-commits at lists.llvm.org
Fri Jun 14 12:17:43 PDT 2024


Author: Jeremy Day
Date: 2024-06-14T22:17:39+03:00
New Revision: cc7a18c18011d1e0c70187ceb60e3e69bf7cd0ee

URL: https://github.com/llvm/llvm-project/commit/cc7a18c18011d1e0c70187ceb60e3e69bf7cd0ee
DIFF: https://github.com/llvm/llvm-project/commit/cc7a18c18011d1e0c70187ceb60e3e69bf7cd0ee.diff

LOG: Set Support system_libs if WIN32, not just MSVC or MINGW (#95505)

The previous check was false when compiling with `clang++`, which
prevented `ntdll` from being specified as a link library, causing an
undefined symbol error when trying to resolve `RtlGetLastNtStatus`.
Since we always want to link these libraries on Windows, the check can
be simplified to just `if( WIN32 )`.

Added: 
    

Modified: 
    llvm/lib/Support/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index c7f8ac325a97a..4d8ce329029d0 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -37,7 +37,7 @@ if(LLVM_ENABLE_ZSTD)
   list(APPEND imported_libs ${zstd_target})
 endif()
 
-if( MSVC OR MINGW )
+if( WIN32 )
   # libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
   # advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
   # ntdll required for RtlGetLastNtStatus in lib/Support/ErrorHandling.cpp.
@@ -72,7 +72,7 @@ elseif( CMAKE_HOST_UNIX )
     add_compile_definitions(_BSD_SOURCE)
     set(system_libs ${system_libs} bsd network)
   endif()
-endif( MSVC OR MINGW )
+endif( WIN32 )
 
 # Delay load shell32.dll if possible to speed up process startup.
 set (delayload_flags)


        


More information about the llvm-commits mailing list