diff options
| author | ruki <[email protected]> | 2021-03-20 00:40:01 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-20 00:40:01 +0800 |
| commit | c1261619d8e7330a1a99e50a73b5baddf2dd66f4 (patch) | |
| tree | af86b368405adf13414ebbf9d7ce6de4f0e9cdb8 | |
| parent | 75aeab68cd10fd361547fb7da23151ede22c70f1 (diff) | |
improve ndk
| -rw-r--r-- | xmake/toolchains/ndk/check.lua | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xmake/toolchains/ndk/check.lua b/xmake/toolchains/ndk/check.lua index b80e1423c..605fa250a 100644 --- a/xmake/toolchains/ndk/check.lua +++ b/xmake/toolchains/ndk/check.lua @@ -30,14 +30,20 @@ function _check_ndk(toolchain) for _, package in ipairs(toolchain:packages()) do local installdir = package:installdir() if installdir and os.isdir(installdir) then - ndk = find_ndk(installdir, {force = true, verbose = option.get("verbose"), sdkver = toolchain:config("sdkver")}) + ndk = find_ndk(installdir, {force = true, verbose = option.get("verbose"), + plat = toolchain:plat(), + arch = toolchain:arch(), + sdkver = toolchain:config("sdkver")}) if ndk then break end end end if not ndk then - ndk = find_ndk(toolchain:config("ndk") or config.get("ndk"), {force = true, verbose = true, sdkver = toolchain:config("sdkver")}) + ndk = find_ndk(toolchain:config("ndk") or config.get("ndk"), {force = true, verbose = true, + plat = toolchain:plat(), + arch = toolchain:arch(), + sdkver = toolchain:config("sdkver")}) end if ndk then toolchain:config_set("ndk", ndk.sdkdir) |