From 19829f49a644d4377c082df90b812a891d4d403c Mon Sep 17 00:00:00 2001 From: Roy Ivy III Date: Sun, 14 Oct 2018 22:12:22 -0500 Subject: fix "fix UCRTVersion" logic for possibly missing WindowsSDKVersion * some versions (especially early versions) of MSVC/VS may not define the WindowsSDKVersion environment variable --- xmake/modules/detect/sdks/find_vstudio.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 2e8083768..5ed3b310c 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -93,7 +93,7 @@ function _load_vcvarsall(vcvarsall, arch) -- @note vcvarsall.bat maybe detect error if install WDK and SDK at same time (multi-sdk version exists in include directory). -- local UCRTVersion = variables["UCRTVersion"] - if UCRTVersion and UCRTVersion ~= WindowsSDKVersion and WindowsSDKVersion ~= "" then + if UCRTVersion and WindowsSDKVersion and UCRTVersion ~= WindowsSDKVersion and WindowsSDKVersion ~= "" then local lib = variables["lib"] if lib then lib = lib:gsub(UCRTVersion, WindowsSDKVersion) -- cgit v1.3.1