From 9c0078c6b9c1309b48f9ece8b5cad1b9be9a75c5 Mon Sep 17 00:00:00 2001
From: Wiimm <wiimm@wiimm.de>
Date: Mon, 30 Nov 2020 16:16:56 +0100
Subject: SZS v2.21a

---
 project/setup/cygwin-copy.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'project/setup')

diff --git a/project/setup/cygwin-copy.sh b/project/setup/cygwin-copy.sh
index 3ce6c46..6e47c33 100644
--- a/project/setup/cygwin-copy.sh
+++ b/project/setup/cygwin-copy.sh
@@ -56,9 +56,18 @@ done
 #------------------------------------------------------------------------------
 # copy needed cygwin dlls
 
+CYGCHECK="$( which cygcheck 2>/dev/null )"
+
 for tool in $CYGWIN_TOOLS
 do
-    ldd "$BIN_PATH/$tool.exe" | grep -F "=> $CYGWIN_DIR/" | awk '{print $1}'
+    if [[ $CYGCHECK ]]
+    then
+	"$CYGCHECK" "$BIN_PATH/$tool.exe" \
+		| grep -E 'cygwin.*\\bin\\.*\.dll' \
+		| sed 's/.*\\//'
+    else
+	ldd "$BIN_PATH/$tool.exe" | grep -F "=> $CYGWIN_DIR/" | awk '{print $1}'
+    fi
 done | sort | uniq | while read dll
 do
     cp --preserve=time "$CYGWIN_DIR/$dll" "$BIN_PATH" || exit 1
-- 
cgit v1.3.1