From 4a4cc16393b93c7190301750eeed6f5247f283ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 26 Nov 2019 12:17:51 +0200
Subject: [PATCH] build-libcxx: Stop manually linking to -lpsapi

Since the default _WIN32_WINNT now is for Windows 7, psapi.h
redirects to PSAPI version 2, which is available in kernel32.dll
with a "K32" prefix on the function names (K32EnumProcessModules).
---
 build-libcxx.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build-libcxx.sh b/build-libcxx.sh
index 40318a2..8965462 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -90,19 +90,12 @@ build_all() {
             -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
             -DCMAKE_CXX_FLAGS="-Wno-dll-attribute-on-redeclaration" \
             -DCMAKE_C_FLAGS="-Wno-dll-attribute-on-redeclaration" \
-            -DCMAKE_SHARED_LINKER_FLAGS="-lpsapi" \
             ..
         make -j$CORES
         make install
         if [ "$type" = "shared" ]; then
             mkdir -p $PREFIX/$arch-w64-mingw32/bin
             cp lib/libunwind.dll $PREFIX/$arch-w64-mingw32/bin
-        else
-            # Merge libpsapi.a into the static library libunwind.a, to
-            # avoid having to specify -lpsapi when linking to it.
-            llvm-ar qcsL \
-                $PREFIX/$arch-w64-mingw32/lib/libunwind.a \
-                $PREFIX/$arch-w64-mingw32/lib/libpsapi.a
         fi
         cd ..
     done