From 4555fcebc9effc2298088bebc7247271a1fe3a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 29 Nov 2023 23:55:10 +0200
Subject: [PATCH] github: Bundle dependencies from MSYS2 into the output
 toolchain

This makes the built toolchain usable outside of MSYS2 too.

For running tests, this has another very subtle effect.

If the toolchain is built in the MSYS2 clang64 environment, the
compiler binary depends on libc++.dll. This DLL is found in $PATH,
in /clang64/bin.

When building/running tests, the current working directory will be
e.g. llvm-mingw/test/x86_64. At some point while building/running
tests, the test makefile will copy the llvm-mingw toolchain's
runtime DLLs into this directory in order to be able to execute those
newly built binaries. This also includes another, different libc++.dll.

When a libc++.dll exists in the current directory, this is preferred
over the one found further back in $PATH in /clang64/bin. As this
file is copied in parallel with other build jobs that might be
doing compilation, those compilation processes may end up loading
this other DLL. If fully copied it probably shouldn't be an issue,
but if not fully copied yet, who knows what might happen.

By making sure that there is a libc++.dll in the same directory as
the toolchain executables (rather than expecting it to be found
further back in $PATH), we ensure that this DLL is loaded and used
instead of the one in the current directory.

This should fix stray errors when running tests in the clang64
environment.
---
 .github/workflows/build.yml |  1 +
 copy-msys-dependencies.sh   | 46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100755 copy-msys-dependencies.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb335a9..ef76528 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -234,6 +234,7 @@ jobs:
         run: |
           ./build-all.sh $(pwd)/install/llvm-mingw --disable-clang-tools-extra --disable-lldb
           .github/workflows/store-version.sh install/llvm-mingw/versions.txt
+          ./copy-msys-dependencies.sh $(pwd)/install/llvm-mingw ${{matrix.sys}}
           ./run-tests.sh $(pwd)/install/llvm-mingw
 
   # Use the Linux cross compilers built in the first step to cross compile
diff --git a/copy-msys-dependencies.sh b/copy-msys-dependencies.sh
new file mode 100755
index 0000000..e6f5fca
--- /dev/null
+++ b/copy-msys-dependencies.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# Copyright (c) 2023 Martin Storsjo
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+set -e
+
+while [ $# -gt 0 ]; do
+    if [ -z "$PREFIX" ]; then
+        PREFIX="$1"
+    elif [ -z "$MSYS_ENV" ]; then
+        MSYS_ENV="$1"
+    else
+        echo Unrecognized parameter $1
+        exit 1
+    fi
+    shift
+done
+if [ -z "$MSYS_ENV" ]; then
+    echo $0 prefix msys_env
+    exit 1
+fi
+
+cd $PREFIX/bin
+for i in ld.lld.exe clang-*.exe lldb.exe; do
+    if [ ! -f "$i" ]; then
+        continue
+    fi
+    for f in $(ldd "$i" | grep /$MSYS_ENV | awk '{print $3}'); do
+        if [ ! -f "$(basename $f)" ]; then
+            echo Copying $f
+            cp $f .
+        fi
+    done
+done