summaryrefslogtreecommitdiff
path: root/xmake/rules
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/rules
parentdfaeb29d10876f4aa7ea586a3400cb9cb89d9598 (diff)
fix some ndk sysroot
Diffstat (limited to 'xmake/rules')
-rw-r--r--xmake/rules/qt/deploy/android.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/rules/qt/deploy/android.lua b/xmake/rules/qt/deploy/android.lua
index 6c61c7baa..97f97ea7a 100644
--- a/xmake/rules/qt/deploy/android.lua
+++ b/xmake/rules/qt/deploy/android.lua
@@ -135,8 +135,8 @@ function main(target, opt)
-- get stdcpp path
local stdcpp_path = path.join(ndk, "sources/cxx-stl/llvm-libc++/libs", target_arch, "libc++_shared.so")
if qt_sdkver and qt_sdkver:ge("5.14") then
- local toolchain = path.directory(assert(toolchain_ndk:bindir(), "toolchain/bin directory not found!"))
- stdcpp_path = path.join(toolchain, "sysroot", "usr", "lib")
+ local ndk_sysroot = assert(toolchain_ndk:config("ndk_sysroot"), "NDK sysroot directory not found!")
+ stdcpp_path = path.join(ndk_sysroot, "usr", "lib")
end
-- get toolchain version