From 7721931851ea6b215e7a0482189dfb99d28bd4f3 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Nov 2018 22:51:36 +0800 Subject: fix c++stl for android ndk >= r17 --- xmake/platforms/android/load.lua | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index 963edc881..12e0ff372 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -106,12 +106,14 @@ function main(platform) platform:add("ldflags", "-fPIE") platform:add("ldflags", "-pie") - -- only for c++ stl - local ndk_toolchains_ver = config.get("ndk_toolchains_ver") - if ndk_toolchains_ver then + -- get c++ stl sdk directory + local cxxstl_sdkdir = path.translate(format("%s/sources/cxx-stl/llvm-libc++", ndk)) + if not os.isdir(cxxstl_sdkdir) and config.get("ndk_toolchains_ver") then -- <= ndk r16 + cxxstl_sdkdir = path.translate(format("%s/sources/cxx-stl/gnu-libstdc++/%s", ndk, config.get("ndk_toolchains_ver"))) + end - -- get c++ stl sdk directory - local cxxstl_sdkdir = path.translate(format("%s/sources/cxx-stl/gnu-libstdc++/%s", ndk, ndk_toolchains_ver)) + -- only for c++ stl + if cxxstl_sdkdir and os.isdir(cxxstl_sdkdir) then -- the toolchains archs local toolchains_archs = -- cgit v1.3.1