improve clang-cl has_flags

2 files changed, 3 insertions, 18 deletions

diff --git a/xmake/modules/core/tools/cl/has_flags.lua b/xmake/modules/core/tools/cl/has_flags.lua
index 5d24818be..dfef0e1c2 100644
--- a/xmake/modules/core/tools/cl/has_flags.lua
+++ b/xmake/modules/core/tools/cl/has_flags.lua
@@ -39,11 +39,7 @@ function _check_from_arglist(flags, opt)
         global_detectcache:set2(key, flagskey, allflags)
         global_detectcache:save()
     end
-    local flag = flags[1]:gsub("/", "-")
-    if flag:startswith("-D") or flag:startswith("-I") then
-        return true
-    end
-    return allflags[flag]
+    return allflags[flags[1]:gsub("/", "-")]
 end
 
 -- get extension
diff --git a/xmake/modules/core/tools/clang_cl/has_flags.lua b/xmake/modules/core/tools/clang_cl/has_flags.lua
index 7d6e8c742..924fb0f3e 100644
--- a/xmake/modules/core/tools/clang_cl/has_flags.lua
+++ b/xmake/modules/core/tools/clang_cl/has_flags.lua
@@ -25,33 +25,22 @@ import("core.tools.cl.check_knownargs")
 
 -- attempt to check it from the argument list
 function _check_from_arglist(flags, opt)
-
-    -- only one flag?
     if #flags > 1 then
         return
     end
-
-    -- make cache key
     local key = "core.tools.clang_cl.has_flags"
-
-    -- make allflags key
     local flagskey = opt.program .. "_" .. (opt.programver or "")
-
-    -- get all allflags from argument list
     local allflags = detectcache:get2(key, flagskey)
     if not allflags then
-
-        -- get argument list
         allflags = {}
-        local arglist = os.iorunv(opt.program, {"-?"})
+        local arglist = os.iorunv(opt.program, {"-?"}, {envs = opt.envs})
         if arglist then
             for arg in arglist:gmatch("(/[%-%a%d]+)%s+") do
                 allflags[arg:gsub("/", "-")] = true
             end
         end
-
-        -- save cache
         detectcache:set2(key, flagskey, allflags)
+        detectcache:save()
     end
     return allflags[flags[1]:gsub("/", "-")]
 end