From 43c40e6c7553147425c7a6b068eca3fd977d172d Mon Sep 17 00:00:00 2001 From: Peter Melnichenko Date: Tue, 3 May 2016 11:44:24 +0300 Subject: [PATCH] Fix incorrect target used when installing just LuaRocks on Windows Use target from identifiers saved when installing Lua instead of using target specified when installing LuaRocks. --- hererocks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hererocks.py b/hererocks.py index a59bcfb..18ee5b2 100755 --- a/hererocks.py +++ b/hererocks.py @@ -1267,7 +1267,7 @@ class LuaRocks(Program): if lua_target == "mingw": return "MinGW Makefiles" - elif using_cl(): + elif lua_target.startswith("vs"): vs_year = lua_identifiers["vs year"] vs_arch = lua_identifiers["vs arch"] vs_short_version = vs_year_to_version[vs_year][:-2] @@ -1292,7 +1292,7 @@ class LuaRocks(Program): "/LUA", opts.location, "/FORCECONFIG", "/F" ] - if opts.target == "mingw": + if lua_identifiers["target"] == "mingw": args += ["/MW"] # Since LuaRocks 2.0.13 if "/LV" in help_text: