diff --git a/mingw-w64-mesa/PKGBUILD b/mingw-w64-mesa/PKGBUILD
index f41a208792..62ef0316f9 100644
--- a/mingw-w64-mesa/PKGBUILD
+++ b/mingw-w64-mesa/PKGBUILD
@@ -26,7 +26,7 @@ source=(https://mesa.freedesktop.org/archive/${_realname}-${pkgver}.tar.xz{,.sig
 sha256sums=('cd951db69c56a97ff0570a7ab2c0e39e6c5323f4cd8f4eb8274723e033beae59'
             'SKIP'
             'fdf26548336cc7e5700560c6636a87ffa63daa3048fa94cf4a4a0b50890c9327'
-            'cd25e05afdd619d760350ca644dc9a615c96b79342865d7b50e11413eeb266b2')
+            '82a8835800fbe5fba31b89aa32232b69fe97088b12b7fc0e47d8ae6102525b70')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # Andres Gomez <tanty@igalia.com>
 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
diff --git a/mingw-w64-mesa/llvmwrapgen.sh b/mingw-w64-mesa/llvmwrapgen.sh
index 2698ae7973..cd5f527213 100644
--- a/mingw-w64-mesa/llvmwrapgen.sh
+++ b/mingw-w64-mesa/llvmwrapgen.sh
@@ -12,14 +12,6 @@ fi
 llvmlibs="${llvmlibs//.a/}"
 llvmlibs=\'"${llvmlibs// /\', \'}"\'
 
-# Get MSYS2 Mingw-w64 runtime location
-mesasrc=${PWD}
-cd ${MINGW_PREFIX}
-msysloc=$(${MINGW_PREFIX}/bin/python3 -c "import os;print(os.getcwd())")
-msysloc=${msysloc//\"/}
-msysloc=${msysloc//\\/\/}
-cd ${mesasrc}
-
 # Generate a Meson wrap file for LLVM
 mkdir -p ./subprojects/llvm
 FILE="./subprojects/llvm/meson.build"
@@ -29,17 +21,17 @@ project('llvm', ['cpp'])
 cpp = meson.get_compiler('cpp')
 
 _deps = []
-_search = '${msysloc}/lib'
+_search = '$(cygpath -m ${MINGW_PREFIX})/lib'
 foreach d : [${llvmlibs}]
   _deps += cpp.find_library(d, dirs : _search)
 endforeach
 
 dep_llvm = declare_dependency(
-  include_directories : include_directories('${msysloc}/include'),
+  include_directories : include_directories('$(cygpath -m ${MINGW_PREFIX})/include'),
   dependencies : _deps,
   version : '$(${MINGW_PREFIX}/bin/llvm-config --version)',
 )
 
 has_rtti = ${rtti}
-irbuilder_h = files('${msysloc}/include/llvm/IR/IRBuilder.h')
+irbuilder_h = files('$(cygpath -m ${MINGW_PREFIX})/include/llvm/IR/IRBuilder.h')
 EOM
\ No newline at end of file