Merge pull request #6817 from xmake-io/opti

Improve build targets

Author: waruqi

xmake/core/sandbox/modules/import/lib/detect/find_program.lua

@@ -43,6 +43,8 @@ function sandbox_lib_detect_find_program._do_check(program, opt)
     -- do not attempt to run program? check it fastly
     if opt.norun then
         return os.isfile(program)
+    elseif opt.norunfile and path.is_absolute(program) and os.isfile(program) then
+        return true
     end
 
     -- no check script? attempt to run it directly
@@ -200,7 +202,11 @@ function sandbox_lib_detect_find_program._find(name, paths, opt)
         if not program_name:endswith(".exe") then
             program_name = program_name .. ".exe"
         end
-        program_path = winos.registry_query("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\" .. program_name)
+        if path.is_absolute(program_name) and os.isfile(program_name) then
+            program_path = program_name
+        else
+            program_path = winos.registry_query("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\" .. program_name)
+        end
         if program_path then
             program_path = program_path:trim()
             if os.isexec(program_path) then
@@ -211,10 +217,19 @@ function sandbox_lib_detect_find_program._find(name, paths, opt)
             end
         end
     else
-        -- attempt to find it use `which program` command
-        local ok, program_path = os.iorunv("which", {name})
-        if ok and program_path then
-            program_path = program_path:trim()
+        if path.is_absolute(name) and os.isfile(name) then
+            program_path = name
+        else
+            -- attempt to find it use `which program` command
+            local ok, result = os.iorunv("which", {name})
+            if ok and result then
+                program_path = result:trim()
+            else
+                program_path = nil
+            end
+        end
+
+        if program_path then
             local program_path_real = sandbox_lib_detect_find_program._check(program_path, opt)
             if program_path_real then
                 return program_path_real
@@ -282,6 +297,7 @@ end
 --                    - opt.paths     the program paths (e.g. dirs, paths, winreg paths, script paths)
 --                    - opt.check     the check script or command
 --                    - opt.norun     do not attempt to run program to check program fastly
+--                    - opt.norunfile do not attempt to run program to check program if it's valid file path.
 --                    - opt.system    true: only find it from system, false: only find it from xmake/packages
 --
 -- @return          the program name or path

xmake/modules/core/tools/gcc.lua

@@ -867,7 +867,7 @@ function nf_pmheader(self, pcheaderfile, opt)
     if self:kind() == "mm" then
         local target = opt.target
         local pcoutputfile = target:pcoutputfile("m")
-        if self:name() == "clang" then
+        if self:name():startswith("clang") then
             return {"-include", pcheaderfile, "-include-pch", pcoutputfile}
         else
             return {"-I", path.directory(pcoutputfile), "-include", path.filename(pcheaderfile)}
@@ -880,7 +880,7 @@ function nf_pmxxheader(self, pcheaderfile, opt)
     if self:kind() == "mxx" then
         local target = opt.target
         local pcoutputfile = target:pcoutputfile("mxx")
-        if self:name() == "clang" then
+        if self:name():startswith("clang") then
             return {"-include", pcheaderfile, "-include-pch", pcoutputfile}
         else
             return {"-I", path.directory(pcoutputfile), "-include", path.filename(pcheaderfile)}

xmake/modules/detect/tools/find_ar.lua

@@ -51,7 +51,8 @@ end
 -- @endcode
 --
 function main(opt)
-    opt       = opt or {}
+    opt = opt or {}
     opt.check = opt.check or _check
+    opt.norunfile = true
     return find_program(opt.program or "ar", opt)
 end

xmake/modules/detect/tools/find_cl.lua

@@ -35,10 +35,9 @@ import("lib.detect.find_programver")
 -- @endcode
 --
 function main(opt)
-
-    -- init options
-    opt         = opt or {}
-    opt.check   = opt.check or function (program)
+    opt = opt or {}
+    opt.norunfile = true
+    opt.check = opt.check or function (program)
         local ok = try { function () os.runv(program, {}, {envs = opt.envs}); return true end }
         if not ok then
             -- @see https://github.com/xmake-io/xmake/issues/3057

xmake/modules/detect/tools/find_clang.lua

@@ -37,6 +37,7 @@ import("lib.detect.find_programver")
 --
 function main(opt)
     opt = opt or {}
+    opt.norunfile = true
     local program = find_program(opt.program or "clang", opt)
     local version = nil
     if program and opt and opt.version then

xmake/modules/detect/tools/find_clang_cl.lua

@@ -35,15 +35,10 @@ import("lib.detect.find_programver")
 -- @endcode
 --
 function main(opt)
-
-    -- init options
     opt = opt or {}
-
-    -- find program
-    local program = find_program(opt.program or "clang-cl.exe", opt)
-
-    -- find program version
+    opt.norunfile = true
     local version = nil
+    local program = find_program(opt.program or "clang-cl.exe", opt)
     if program and opt and opt.version then
         version = find_programver(program, opt)
     end

xmake/modules/detect/tools/find_clangxx.lua

@@ -37,6 +37,7 @@ import("lib.detect.find_programver")
 --
 function main(opt)
     opt = opt or {}
+    opt.norunfile = true
     local program = find_program(opt.program or "clang++", opt)
     local version = nil
     if program and opt and opt.version then

xmake/modules/detect/tools/find_gcc.lua

@@ -53,6 +53,7 @@ end
 --
 function main(opt)
     opt = opt or {}
+    opt.norunfile = true
     local program = find_program(opt.program or "gcc", opt)
     local version = nil
     if program and opt.version then

xmake/modules/detect/tools/find_gxx.lua

@@ -37,8 +37,8 @@ import("detect.tools.find_gcc")
 -- @endcode
 --
 function main(opt)
-
     opt = opt or {}
+    opt.norunfile = true
     local program = find_program(opt.program or "g++", opt)
     local version = nil
     if program and opt and opt.version then

xmake/modules/detect/tools/find_link.lua

@@ -43,6 +43,7 @@ function main(opt)
 
     -- init options
     opt = opt or {}
+    opt.norunfile = true
     opt.check = opt.check or function (program)
         local toolchain = opt.toolchain
         if toolchain and toolchain:name() == "masm32" then