summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-07-05 12:59:00 +0800
committerruki <[email protected]>2017-07-05 12:59:00 +0800
commita8d5da851d1d469587adea086c65d61ae20c50ef (patch)
tree262425a7ef44f4de739c86bdea629450173a1b8c
parentc5f2c9e5488c0213e4eafb2775574343154bdc64 (diff)
fix windows envirnoment for global
-rw-r--r--xmake/platforms/windows/environment.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/xmake/platforms/windows/environment.lua b/xmake/platforms/windows/environment.lua
index 5281880e0..11c9a6534 100644
--- a/xmake/platforms/windows/environment.lua
+++ b/xmake/platforms/windows/environment.lua
@@ -35,8 +35,11 @@ function _enter(name)
return
end
+ -- get arch
+ local arch = config.get("arch") or global.get("arch") or ""
+
-- get vs environment for the current arch
- local vsenv = vcvarsall[config.get("arch") or ""] or {}
+ local vsenv = vcvarsall[arch] or {}
-- get the pathes for the vs environment
local old = nil