summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Leclercq <[email protected]>2024-06-24 09:48:06 +0200
committerGitHub <[email protected]>2024-06-24 09:48:06 +0200
commit68637834ec5723f19656ac9ec12e86b5b86bd9c3 (patch)
tree555ef2b12eb56f7d2825d953eb4ed520c6f2e78e
parent9eb191fc028f32d71de393cd2a46df7fc076bf4b (diff)
Revert wrong change in ebc4520b6ce93e6f31d6885f5f5820f5992962ee
-rw-r--r--xmake/toolchains/ndk/load.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua
index 5525d00d2..98c08faa5 100644
--- a/xmake/toolchains/ndk/load.lua
+++ b/xmake/toolchains/ndk/load.lua
@@ -321,8 +321,8 @@ function main(toolchain)
-- The NDK's libc++ now comes directly from our LLVM toolchain above 26b
-- https://github.com/xmake-io/xmake/issues/4614
if ndk_cxxstl == "c++_static" then
- toolchain:add("ldflags", "-static-libstdc++")
- toolchain:add("shflags", "-static-libstdc++")
+ toolchain:add("ldflags", "-static-libstdc++", "-lc++abi")
+ toolchain:add("shflags", "-static-libstdc++", "-lc++abi")
if arm32 then
toolchain:add("syslinks", "unwind", "atomic")
end