diff options
| author | ruki <[email protected]> | 2021-03-17 23:48:17 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-17 23:48:17 +0800 |
| commit | d21c2ddddaf93404b9a0f6aedfc939b38fde86ca (patch) | |
| tree | 0fcd5181c1ae62b64e25bd3da36b07d9d5759dc6 | |
| parent | dfaeb29d10876f4aa7ea586a3400cb9cb89d9598 (diff) | |
fix some ndk sysroot
| -rw-r--r-- | xmake/modules/package/manager/conan/install_package.lua | 7 | ||||
| -rw-r--r-- | xmake/rules/qt/deploy/android.lua | 4 |
2 files changed, 6 insertions, 5 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") 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 |