diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/core/cfg.lua | 11 |
1 files changed, 8 insertions, 3 deletions
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) | |||
| 331 | defaults.external_deps_dirs = { "c:/external/", "c:/mingw", "c:/windows/system32" } | 331 | defaults.external_deps_dirs = { "c:/external/", "c:/mingw", "c:/windows/system32" } |
| 332 | defaults.cmake_generator = "MinGW Makefiles" | 332 | defaults.cmake_generator = "MinGW Makefiles" |
| 333 | defaults.variables.MAKE = "mingw32-make" | 333 | defaults.variables.MAKE = "mingw32-make" |
| 334 | defaults.variables.CC = "mingw32-gcc" | 334 | if target_cpu == "x86_64" then |
| 335 | defaults.variables.RC = "windres" | 335 | defaults.variables.CC = "x86_64-w64-mingw32-gcc" |
| 336 | defaults.variables.LD = "mingw32-gcc" | 336 | defaults.variables.LD = "x86_64-w64-mingw32-gcc" |
| 337 | else | ||
| 338 | defaults.variables.CC = "mingw32-gcc" | ||
| 339 | defaults.variables.LD = "mingw32-gcc" | ||
| 340 | end | ||
| 337 | defaults.variables.AR = "ar" | 341 | defaults.variables.AR = "ar" |
| 342 | defaults.variables.RC = "windres" | ||
| 338 | defaults.variables.RANLIB = "ranlib" | 343 | defaults.variables.RANLIB = "ranlib" |
| 339 | defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" | 344 | defaults.variables.CFLAGS = os.getenv("CFLAGS") or "-O2" |
| 340 | defaults.variables.LDFLAGS = os.getenv("LDFLAGS") | 345 | defaults.variables.LDFLAGS = os.getenv("LDFLAGS") |
