[Openmp-commits] [openmp] dc3156d - [OpenMP] Don't hardcode _WIN32_WINNT for MinGW targets (#115708)

[via Openmp-commits]

Author: Martin Storsjö
Date: 2024-11-16T11:23:15+02:00
New Revision: dc3156d8e6dc6494bc47ba074d0c990eb27b7564

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

LOG: [OpenMP] Don't hardcode _WIN32_WINNT for MinGW targets (#115708)

Instead respect what the toolchain default is (or what the user sets via
CMAKE_CXX_FLAGS).

This fixes builds with libcxx, with mingw toolchains targeting
msvcrt.dll, after 5d8be4c036aa5ce4a94f1f37a9155d5c877e23db; after that
commit, the libcxx public headers reference symbols such as iswspace_l,
which are unavailable when targeting msvcrt.dll on older versions of
Windows (it's only available in msvcrt.dll since Windows Vista).

Added: 
    

Modified: 
    openmp/runtime/cmake/LibompDefinitions.cmake

Removed: 
    


################################################################################
diff  --git a/openmp/runtime/cmake/LibompDefinitions.cmake b/openmp/runtime/cmake/LibompDefinitions.cmake
index 1d8a88966d9393..c85e15323e0ee4 100644
--- a/openmp/runtime/cmake/LibompDefinitions.cmake
+++ b/openmp/runtime/cmake/LibompDefinitions.cmake
@@ -16,7 +16,12 @@ function(libomp_get_definitions_flags cppflags)
     libomp_append(cppflags_local "-D _CRT_SECURE_NO_DEPRECATE")
     libomp_append(cppflags_local "-D _WINDOWS")
     libomp_append(cppflags_local "-D _WINNT")
-    libomp_append(cppflags_local "-D _WIN32_WINNT=0x0501")
+    if (MSVC)
+      # Force a default target OS version with MSVC based toolchains.
+      # (For MinGW based ones, use the toolchain's default target or what
+      # the user set in CMake flags.)
+      libomp_append(cppflags_local "-D _WIN32_WINNT=0x0501")
+    endif()
     libomp_append(cppflags_local "-D _USRDLL")
     libomp_append(cppflags_local "-D _ITERATOR_DEBUG_LEVEL=0" IF_TRUE DEBUG_BUILD)
     libomp_append(cppflags_local "-D _DEBUG" IF_TRUE DEBUG_BUILD)