diff options
| author | ruki <[email protected]> | 2020-05-20 00:09:01 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-05-19 18:54:07 +0800 |
| commit | dc156eb40a6aa5f3a564ccbb82bd8319274bfb0c (patch) | |
| tree | 5e76f531be3d0992c406698c1d676cb076517e8e | |
| parent | 42d26ba464c91d368eb6fdc44377561213f5ca3b (diff) | |
fix find_ndk
| -rw-r--r-- | xmake/modules/detect/sdks/find_ndk.lua | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua index 7dee10690..f0ee66676 100644 --- a/xmake/modules/detect/sdks/find_ndk.lua +++ b/xmake/modules/detect/sdks/find_ndk.lua @@ -101,7 +101,7 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) -- find ndk root directory sdkdir = _find_ndkdir(sdkdir) if not sdkdir then - return {} + return end -- get cross @@ -142,14 +142,11 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) bindir = find_directory("bin", path.join(sdkdir, "toolchains", gcc_toolchain_subdir, "prebuilt", "*")) end if not bindir then - return {} + return end -- find the sdk version local sdkver = ndk_sdkver or _find_ndk_sdkver(sdkdir, bindir, arch) - if not sdkver then - return {} - end -- find the gcc toolchain local gcc_toolchain = find_directory("bin", path.join(sdkdir, "toolchains", gcc_toolchain_subdir, "prebuilt", "*")) @@ -159,9 +156,6 @@ function _find_ndk(sdkdir, arch, ndk_sdkver, ndk_toolchains_ver) -- find the toolchains version local toolchains_ver = ndk_toolchains_ver or _find_ndk_toolchains_ver(gcc_toolchain or bindir) - if not toolchains_ver then - return {} - end -- get ndk version, e.g. r16b, .. local ndkver = nil |