diff options
| author | ruki <[email protected]> | 2017-07-21 16:36:21 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-07-21 16:36:21 +0800 |
| commit | 887823f1a3bfabbd75a84640a5c8d5a992426179 (patch) | |
| tree | b525e87bc8318964e9ef60fa058b15cc5c99c580 | |
| parent | b56af6040ff2329387562b99b5987a7fadabddd6 (diff) | |
fix check toolchain for android platform
| -rw-r--r-- | xmake/platforms/checker.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/xmake/platforms/checker.lua b/xmake/platforms/checker.lua index dd9da849d..10e722a3f 100644 --- a/xmake/platforms/checker.lua +++ b/xmake/platforms/checker.lua @@ -184,13 +184,16 @@ function toolchain_insert(toolchains, toolkind, cross, name, description, check) end -- check the toolchain -function toolchain_check(kind, toolkind, toolchains) +function toolchain_check(config_or_kind, toolkind, toolchains) -- init config name local confignames = {config = "core.project.config", global = "core.base.global"} -- import config module - local config = import(confignames[kind]) + local config = config_or_kind + if type(config_or_kind) == "string" then + config = import(confignames[config_or_kind]) + end -- load toolchains if be function if type(toolchains) == "function" then |
