Try fixing windows again

Author: elsteveogrande

libcxx/src/CMakeLists.txt

@@ -254,7 +254,7 @@ if (LIBCXX_ENABLE_SHARED)
   list(APPEND LIBCXX_BUILD_TARGETS "cxx_shared")
 endif()
 
-if(WIN32 AND NOT (${CMAKE_CXX_COMPILER_FRONTEND_VARIANT} STREQUAL "MSVC"))
+if(WIN32)
   string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}dbghelp")
   string(APPEND link_libraries " ${CMAKE_LINK_LIBRARY_FLAG}psapi")
 endif()

libcxx/src/stacktrace/windows_impl.cpp

@@ -17,11 +17,6 @@
 #  include <psapi.h>
 #  include <stacktrace>
 
-#  if defined(_MSC_VER)
-#    pragma comment(lib, "dbghelp.lib")
-#    pragma comment(lib, "psapi.lib")
-#  endif
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 namespace __stacktrace {