diff options
| author | ruki <[email protected]> | 2021-09-26 11:24:49 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-09-26 11:24:49 +0800 |
| commit | be70f45c99e92a8f72c52bca943601761e18215d (patch) | |
| tree | d115872c6d73ea9601c574ed43740a0ad0a56a5f /xmake/toolchains | |
| parent | 32f89fbfcfb6367f09813750c8c791647e24b63d (diff) | |
improve android ndk support for r23
Diffstat (limited to 'xmake/toolchains')
| -rw-r--r-- | xmake/toolchains/ndk/check.lua | 1 | ||||
| -rw-r--r-- | xmake/toolchains/ndk/load.lua | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xmake/toolchains/ndk/check.lua b/xmake/toolchains/ndk/check.lua index aaf1d609a..991e4e3d9 100644 --- a/xmake/toolchains/ndk/check.lua +++ b/xmake/toolchains/ndk/check.lua @@ -49,6 +49,7 @@ function _check_ndk(toolchain) toolchain:config_set("ndk", ndk.sdkdir) toolchain:config_set("bindir", ndk.bindir) toolchain:config_set("cross", ndk.cross) + toolchain:config_set("llvm_toolchain", ndk.llvm_toolchain) toolchain:config_set("gcc_toolchain", ndk.gcc_toolchain) toolchain:config_set("ndkver", ndk.ndkver) toolchain:config_set("ndk_sdkver", ndk.sdkver) diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index 29e88d7ad..059f6b417 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -167,8 +167,10 @@ function main(toolchain) local ndk_sysroot = toolchain:config("ndk_sysroot") if ndk_sysroot and os.isdir(ndk_sysroot) then local triple = _get_triple(arch) - toolchain:add("cxflags", "-D__ANDROID_API__=" .. ndk_sdkver) - toolchain:add("asflags", "-D__ANDROID_API__=" .. ndk_sdkver) + if ndkver and tonumber(ndkver) < 22 then + toolchain:add("cxflags", "-D__ANDROID_API__=" .. ndk_sdkver) + toolchain:add("asflags", "-D__ANDROID_API__=" .. ndk_sdkver) + end toolchain:add("cflags", "--sysroot=" .. ndk_sysroot) toolchain:add("cxxflags","--sysroot=" .. ndk_sysroot) toolchain:add("asflags", "--sysroot=" .. ndk_sysroot) |