Try to fix windows mingw build

Author: elsteveogrande

libcxx/src/CMakeLists.txt

@@ -254,6 +254,11 @@ if (LIBCXX_ENABLE_SHARED)
   list(APPEND LIBCXX_BUILD_TARGETS "cxx_shared")
 endif()
 
+if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_FRONTEND_VARIANT} STREQUAL "MSVC"))
+  string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}dbghelp")
+  string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}psapi")
+endif()
+
 if(WIN32 AND NOT MINGW AND NOT "${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
   # Since we most likely do not have a mt.exe replacement, disable the
   # manifest bundling.  This allows a normal cmake invocation to pass which

libcxx/src/stacktrace/windows_impl.cpp

@@ -10,16 +10,17 @@
 
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
-//
-#  include <dbghelp.h>
-#  include <psapi.h>
-//
+
 #  include <cstring>
+#  include <dbghelp.h>
 #  include <mutex>
+#  include <psapi.h>
 #  include <stacktrace>
 
-#  pragma comment(lib, "dbghelp.lib")
-#  pragma comment(lib, "psapi.lib")
+#  if defined(_MSC_VER)
+#    pragma comment(lib, "dbghelp.lib")
+#    pragma comment(lib, "psapi.lib")
+#  endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {