aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobil4sk <tobil4sk@outlook.com>2025-02-21 17:21:53 +0000
committerGitHub <noreply@github.com>2025-02-21 14:21:53 -0300
commit161eecbd34036137d9528bab487d2cfa0668bb4c (patch)
tree086f1827bb9102b3c1c82b3dfbadf37396196f88
parentf87af07f1bec82a312c3c82e92627c41db9b9bc9 (diff)
downloadluarocks-161eecbd34036137d9528bab487d2cfa0668bb4c.tar.gz
luarocks-161eecbd34036137d9528bab487d2cfa0668bb4c.tar.bz2
luarocks-161eecbd34036137d9528bab487d2cfa0668bb4c.zip
Fix make check for msys2 mingw system (#1745)
On an msys2 install of mingw, make is installed as `mingw32-make`. If `cmake` is installed, that takes priority over `mingw32-make` when matching the pattern `*make*.exe`. This patch changes the pattern to be `*-make*.exe` instead to avoid this bug.
-rw-r--r--install.bat2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.bat b/install.bat
index 37d69b9c..3d7b2ecd 100644
--- a/install.bat
+++ b/install.bat
@@ -750,7 +750,7 @@ local find_gcc_suite = function()
750 for i, name in ipairs({"make", "ar", "windres", "ranlib"}) do 750 for i, name in ipairs({"make", "ar", "windres", "ranlib"}) do
751 result[name] = find_file(name..".exe", path) 751 result[name] = find_file(name..".exe", path)
752 if not result[name] then 752 if not result[name] then
753 result[name] = find_file("*"..name.."*.exe", path) 753 result[name] = find_file("*-"..name.."*.exe", path)
754 end 754 end
755 end 755 end
756 756