check allowed archs

xmake-io · Jul 20, 2021 · b49d1cc · b49d1cc
1 parent 801cc4d
commit b49d1cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
@@ -221,12 +221,20 @@ function _check_configs()
     end
 
     -- check allowed archs
+    local plat = config.plat()
     local arch = config.arch()
     local allowedarchs = table.wrap(project.get("allowedarchs"))
     if #allowedarchs > 0 then
-        local allowedarchs_set = hashset.from(allowedarchs)
+        local allowedarchs_current = {}
+        for _, allowedarch in ipairs(allowedarchs) do
+            local p = project.extraconf("allowedarchs", allowedarch, "plat")
+            if p == plat then
+                table.insert(allowedarchs_current, allowedarch)
+            end
+        end
+        local allowedarchs_set = hashset.from(allowedarchs_current)
         if not allowedarchs_set:has(arch) then
-            local allowedarchs_str = table.concat(allowedarchs, ", ")
+            local allowedarchs_str = table.concat(allowedarchs_current, ", ")
             raise("`%s` is not a valid complation arch for this project, please use one of %s", arch, allowedarchs_str)
         end
     end

diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
@@ -657,6 +657,8 @@ function project.apis()
         ,   "add_requires"
         ,   "add_requireconfs"
         ,   "add_repositories"
+        ,   "add_allowedmodes"
+        ,   "add_allowedarchs"
         }
     ,   paths =
         {