[llvm] 042a2e8 - [Support] Fix WS2_32 casing

Shoaib Meenai via llvm-commits llvm-commits at lists.llvm.org
Wed Dec 13 19:02:16 PST 2023


Author: Shoaib Meenai
Date: 2023-12-13T19:02:08-08:00
New Revision: 042a2e8932984e6c9f2017cbabb5bc66ad5419ce

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

LOG: [Support] Fix WS2_32 casing

The file name is WS2_32.Lib in all the Windows SDK versions I looked at.
You can get away with the incorrect casing on a case-insensitive file
system but it can matter for cross-compilation.

Added: 
    

Modified: 
    llvm/lib/Support/CMakeLists.txt
    llvm/test/tools/llvm-config/system-libs.windows.test

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
index 80854d1d09d985..5c8bf304509ce9 100644
--- a/llvm/lib/Support/CMakeLists.txt
+++ b/llvm/lib/Support/CMakeLists.txt
@@ -40,7 +40,7 @@ endif()
 if( MSVC OR MINGW )
   # libuuid required for FOLDERID_Profile usage in lib/Support/Windows/Path.inc.
   # advapi32 required for CryptAcquireContextW in lib/Support/Windows/Path.inc.
-  set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32 Ws2_32)
+  set(system_libs ${system_libs} psapi shell32 ole32 uuid advapi32 WS2_32)
 elseif( CMAKE_HOST_UNIX )
   if( HAVE_LIBRT )
     set(system_libs ${system_libs} rt)

diff  --git a/llvm/test/tools/llvm-config/system-libs.windows.test b/llvm/test/tools/llvm-config/system-libs.windows.test
index 007be5cb866a49..cf01657ad3ee49 100644
--- a/llvm/test/tools/llvm-config/system-libs.windows.test
+++ b/llvm/test/tools/llvm-config/system-libs.windows.test
@@ -2,6 +2,6 @@ RUN: llvm-config --link-static --system-libs Support 2>&1 | FileCheck %s
 REQUIRES: static-libs
 REQUIRES: host={{.*-windows-msvc}}
 CHECK-NOT: -l
-CHECK: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib Ws2_32.lib{{$}}
+CHECK: psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib WS2_32.lib{{$}}
 CHECK-NOT: error
 CHECK-NOT: warning


        


More information about the llvm-commits mailing list