diff options
| author | ruki <[email protected]> | 2017-11-29 23:43:29 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-11-29 16:20:58 +0800 |
| commit | da1d0ed5b5a78039c787ce89243f1c4d88c24334 (patch) | |
| tree | 80387975f4d718873e8551fe25d182e310448710 | |
| parent | 5b98e5ebcabfdb83a4ab0d333210839d056a98fb (diff) | |
fix generate vcvarsall data file error
| -rw-r--r-- | xmake/actions/require/environment.lua | 1 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/xmake/actions/require/environment.lua b/xmake/actions/require/environment.lua index 87c2666c0..3d58c8f44 100644 --- a/xmake/actions/require/environment.lua +++ b/xmake/actions/require/environment.lua @@ -62,7 +62,6 @@ function leave() for _, name in ipairs("cc", "cxx", "mm", "mxx", "ld", "ar", "sh") do local value = _g.toolenvs[name] if value then - print(name, #value) os.setenv(name:upper(), value) end end diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index a33b16f28..fa80228eb 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -30,7 +30,7 @@ function _load_vcvarsall(vcvarsall, arch) -- make the genvcvars.bat local genvcvars_bat = os.tmpfile() .. "_genvcvars.bat" - local genvcvars_dat = os.tmpfile() .. "_genvcvars.dat" + local genvcvars_dat = os.tmpfile() .. "_genvcvars.txt" local file = io.open(genvcvars_bat, "w") file:print("@echo off") file:print("call \"%s\" %s > nul", vcvarsall, arch) |