aboutsummaryrefslogtreecommitdiff
path: root/install.bat
diff options
context:
space:
mode:
authorXpol Wan <xpolife@gmail.com>2015-10-27 00:39:07 +0800
committerXpol Wan <xpolife@gmail.com>2015-10-27 00:39:07 +0800
commit00184f35d70af9b2cf746e8a2de156d06c88101b (patch)
tree842a81fedb3aacb9bd61b4efbc989f7daf17d7fd /install.bat
parent04e45199b0a76808fce9850713ba8e79a47cb9fd (diff)
downloadluarocks-00184f35d70af9b2cf746e8a2de156d06c88101b.tar.gz
luarocks-00184f35d70af9b2cf746e8a2de156d06c88101b.tar.bz2
luarocks-00184f35d70af9b2cf746e8a2de156d06c88101b.zip
Move mingw test out of get_msvc_env_setup_cmd().
Diffstat (limited to 'install.bat')
-rw-r--r--install.bat4
1 files changed, 1 insertions, 3 deletions
diff --git a/install.bat b/install.bat
index c3099988..cfc5f074 100644
--- a/install.bat
+++ b/install.bat
@@ -436,8 +436,6 @@ end
436-- returns the batch command to setup msvc compiler path. 436-- returns the batch command to setup msvc compiler path.
437-- requires vars.LUA_RUNTIME and vars.UNAME_M to be set before calling this function. 437-- requires vars.LUA_RUNTIME and vars.UNAME_M to be set before calling this function.
438local function get_msvc_env_setup_cmd() 438local function get_msvc_env_setup_cmd()
439 if USE_MINGW then return "" end -- Don't setup msvc for MinGW.
440
441 local product_dir = get_visual_studio_directory() 439 local product_dir = get_visual_studio_directory()
442 local x64 = vars.UNAME_M=="x86_64" 440 local x64 = vars.UNAME_M=="x86_64"
443 441
@@ -678,7 +676,7 @@ if SELFCONTAINED then
678 vars.TREE_ROOT = vars.PREFIX..[[\systree]] 676 vars.TREE_ROOT = vars.PREFIX..[[\systree]]
679 REGISTRY = false 677 REGISTRY = false
680end 678end
681vars.COMPILER_ENV_CMD = get_msvc_env_setup_cmd() 679vars.COMPILER_ENV_CMD = USE_MINGW and "" or get_msvc_env_setup_cmd()
682 680
683print(S[[ 681print(S[[
684 682