From ea8a9de0070f8fc2e1fb682ddd4726f3fe5e441f Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 14 Nov 2018 22:54:26 +0800 Subject: fix stl links for android ndk --- xmake/platforms/android/load.lua | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'xmake/platforms/android/load.lua') diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index 12e0ff372..6ed977f2f 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -131,8 +131,13 @@ function main(platform) platform:add("cxxflags", format("-I%s/libs/%s/include", cxxstl_sdkdir, toolchains_archs[arch])) platform:add("ldflags", format("-L%s/libs/%s", cxxstl_sdkdir, toolchains_archs[arch])) platform:add("shflags", format("-L%s/libs/%s", cxxstl_sdkdir, toolchains_archs[arch])) - platform:add("ldflags", "-lgnustl_static") - platform:add("shflags", "-lgnustl_static") + if cxxstl_sdkdir:find("llvm-libc++", 1, true) then + platform:add("ldflags", "-lc++") + platform:add("shflags", "-lc++") + else + platform:add("ldflags", "-lgnustl_static") + platform:add("shflags", "-lgnustl_static") + end end end end -- cgit v1.3.1