summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-12-17 00:05:41 +0800
committerruki <[email protected]>2020-12-17 00:05:41 +0800
commitcd5449d66ce5463202b4ccde6b41edf9486b42f5 (patch)
treebb78561d1870e2f0a33fd1189463cb496a786e48
parent1392992e8e941f188238c31ca9282bdd2f3d4531 (diff)
improve to find plat/arch
-rw-r--r--xmake/actions/config/main.lua10
1 files changed, 5 insertions, 5 deletions
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 6c143bf81..c52d2a179 100644
--- a/xmake/actions/config/main.lua
+++ b/xmake/actions/config/main.lua
@@ -195,6 +195,11 @@ force to build in current directory via run `xmake -P .`]], os.projectdir())
-- lock the whole project
project.lock()
+ -- find default platform and save to configuration
+ local plat, arch = find_platform({global = true})
+ assert(plat == config.plat())
+ assert(arch == config.arch())
+
-- enter menu config
local options_changed = false
if option.get("menu") then
@@ -269,11 +274,6 @@ force to build in current directory via run `xmake -P .`]], os.projectdir())
end
end
- -- find default platform and save to configuration
- local plat, arch = find_platform({global = true})
- assert(plat == config.plat())
- assert(arch == config.arch())
-
-- load platform instance
local instance_plat = platform.load(plat, arch)