Merge 3260d857fb into cd6663abb6

xmake/modules/package/manager/pacman/find_package.lua

@@ -184,7 +184,7 @@ function main(name, opt)
     end
 
     -- get package files list
-    list = name and try { function() return os.iorunv(pacman.program, {"-Q", "-l", name}) end }
+    local list = name and try { function() return os.iorunv(pacman.program, {"-Q", "-l", name}) end }
     if not list then
         return
     end

xmake/modules/private/check/checkers/clang/tidy.lua

@@ -81,8 +81,8 @@ function _add_target_files(sourcefiles, target)
     end
 end
 
--- check sourcefile
+-- check sourcefiles
-function _check_sourcefile(clang_tidy, sourcefile, opt)
+function _check_sourcefiles(clang_tidy, sourcefiles, opt)
     opt = opt or {}
     local projectdir = project.directory()
     local argv = {}
@@ -108,10 +108,12 @@ function _check_sourcefile(clang_tidy, sourcefile, opt)
     if opt.quiet then
         table.insert(argv, "--quiet")
     end
-    if not path.is_absolute(sourcefile) then
+    for _, sourcefile in ipairs(sourcefiles) do
-        sourcefile = path.absolute(sourcefile, projectdir)
+        if not path.is_absolute(sourcefile) then
+            sourcefile = path.absolute(sourcefile, projectdir)
+        end
+        table.insert(argv, sourcefile)
     end
-    table.insert(argv, sourcefile)
     os.execv(clang_tidy, argv, {curdir = projectdir})
 end
 
@@ -164,15 +166,7 @@ function _check(clang_tidy, opt)
     end
 
     -- check files
-    local jobs = tonumber(opt.jobs or "1")
+    _check_sourcefiles(clang_tidy, sourcefiles, opt)
-    runjobs("check_files", function (index)
-        local sourcefile = sourcefiles[index]
-        if sourcefile then
-            _check_sourcefile(clang_tidy, sourcefile, opt)
-        end
-    end, {total = #sourcefiles,
-          comax = jobs,
-          isolate = true})
 end
 
 function main(argv)

xmake/toolchains/armclang/xmake.lua

@@ -39,7 +39,7 @@ toolchain("armclang")
             toolchain:config_set("sdkdir", mdk.sdkdir_armclang)
             -- different assembler choices for different versions of armclang
             local armclang = find_tool("armclang", {version = true, force = true, paths = path.join(mdk.sdkdir_armclang, "bin")})
-            if armclang and semver.compare(armclang.version, "6.13") > 0 then
+            if armclang and armclang.version and semver.compare(armclang.version, "6.13") > 0 then
                 toolchain:config_set("toolset_as", "armclang")
             else
                 toolchain:config_set("toolset_as", "armasm")