From 6441053b53b77f9d96891b71d5e8b431e84bfb04 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Thu, 28 Jul 2022 23:57:09 -0300 Subject: mingw: default to x86_64 compiler on 64-bit Windows --- src/luarocks/core/cfg.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index 5b406121..4df2bcdc 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua @@ -331,10 +331,15 @@ local function make_defaults(lua_version, target_cpu, platforms, home) defaults.external_deps_dirs = { "c:/external/", "c:/mingw", "c:/windows/system32" } defaults.cmake_generator = "MinGW Makefiles" defaults.variables.MAKE = "mingw32-make" - defaults.variables.CC = "mingw32-gcc" - defaults.variables.RC = "windres" - defaults.variables.LD = "mingw32-gcc" + if target_cpu == "x86_64" then + defaults.variables.CC = "x86_64-w64-mingw32-gcc" + defaults.variables.LD = "x86_64-w64-mingw32-gcc" + else + defaults.variables.CC = "mingw32-gcc" + defaults.variables.LD = "mingw32-gcc" + end defaults.variables.AR = "ar" + defaults.variables.RC = "windres" defaults.variables.RANLIB = "ranlib" defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" defaults.variables.LDFLAGS = os.getenv("LDFLAGS") -- cgit v1.2.3-55-g6feb