From 0b71b8d8eba9b0355ca761549255312d8dcbf4b7 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Jul 2021 15:24:55 +0100
Subject: [PATCH] Use simpler expression for libgcc path in MSW CI workflow

Use the gcc option which outputs this path directly, rather than
constructing it manually from pieces.

No real changes.
---
 .github/workflows/ci_msw_cross.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml
index 57847cd1dd..8b6043fed4 100644
--- a/.github/workflows/ci_msw_cross.yml
+++ b/.github/workflows/ci_msw_cross.yml
@@ -128,7 +128,7 @@ jobs:
           sudo chown -R $normal_uid $GITHUB_WORKSPACE
 
           # Add the directories containing MinGW and wx DLLs to Wine path.
-          winepath="$(winepath --windows /usr/lib/gcc/${HOST_TRIPLET}/$(${HOST_TRIPLET}-gcc -dumpversion|tr -d '\r'))"
+          winepath="$(winepath --windows $(dirname $(${HOST_TRIPLET}-g++ -print-libgcc-file-name)))"
           winepath="${winepath};$(winepath --windows $(pwd)/lib)"
           echo "WINEPATH=${winepath}" >> $GITHUB_ENV