summaryrefslogtreecommitdiff
path: root/xmake/modules
diff options
context:
space:
mode:
authorruki <[email protected]>2021-03-17 23:48:17 +0800
committerruki <[email protected]>2021-03-17 23:48:17 +0800
commitd21c2ddddaf93404b9a0f6aedfc939b38fde86ca (patch)
tree0fcd5181c1ae62b64e25bd3da36b07d9d5759dc6 /xmake/modules
parentdfaeb29d10876f4aa7ea586a3400cb9cb89d9598 (diff)
fix some ndk sysroot
Diffstat (limited to 'xmake/modules')
-rw-r--r--xmake/modules/package/manager/conan/install_package.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmake/modules/package/manager/conan/install_package.lua b/xmake/modules/package/manager/conan/install_package.lua
index 0b27fdb24..97af3b4b8 100644
--- a/xmake/modules/package/manager/conan/install_package.lua
+++ b/xmake/modules/package/manager/conan/install_package.lua
@@ -271,10 +271,11 @@ function main(name, opt)
envs.ARFLAGS = table.concat(table.wrap(_conan_get_build_env("arflags", opt.plat)), ' ')
envs.LDFLAGS = table.concat(table.wrap(_conan_get_build_env("ldflags", opt.plat)), ' ')
envs.SHFLAGS = table.concat(table.wrap(_conan_get_build_env("shflags", opt.plat)), ' ')
- local ndk = config.get("ndk")
- if ndk then
+ local toolchain_ndk = toolchain.load("ndk", {plat = opt.plat, arch = opt.arch})
+ local ndk_sysroot = toolchain_ndk:config("ndk_sysroot")
+ if ndk_sysroot then
table.insert(argv, "-e")
- table.insert(argv, "CONAN_CMAKE_FIND_ROOT_PATH=" .. path.join(ndk, "sysroot"))
+ table.insert(argv, "CONAN_CMAKE_FIND_ROOT_PATH=" .. ndk_sysroot)
end
for k, v in pairs(envs) do
table.insert(argv, "-e")