diff options
| author | ruki <[email protected]> | 2026-08-06 20:56:46 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-08-06 20:56:46 +0800 |
| commit | 71bc0ee880fa6be6452cbea2dddf00f45ff43c7e (patch) | |
| tree | 95f374bcd4a3827dbc3b4b5be7c85250e8bdcc8e /xmake/languages/c++/xmake.lua | |
| parent | 53c06b72cc8b1521aae266543aee634c917a030f (diff) | |
| parent | e129ec374599dfddb45f1a157a64f7330f9a6124 (diff) | |
Merge pull request #7688 from xmake-io/runtime
improve clang static libc++ runtimes
Diffstat (limited to 'xmake/languages/c++/xmake.lua')
| -rw-r--r-- | xmake/languages/c++/xmake.lua | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua index b94a073b8..42ddc2884 100644 --- a/xmake/languages/c++/xmake.lua +++ b/xmake/languages/c++/xmake.lua @@ -60,8 +60,7 @@ language("c++") , "toolchain.sysincludedirs" } , binary = { - "target.runtimes" - , "config.linkdirs" + "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" @@ -79,13 +78,16 @@ language("c++") , "config.frameworks" , "target.frameworks" , "toolchain.frameworks" + -- runtimes may link libc++.a/libc++abi.a explicitly, so it must come after the + -- object files and user links, but before the syslinks it depends on (e.g. pthread) + -- @see https://github.com/xmake-io/xmake/issues/7442 + , "target.runtimes" , "config.syslinks" , "target.syslinks" , "toolchain.syslinks" } , shared = { - "target.runtimes" - , "config.linkdirs" + "config.linkdirs" , "config.frameworkdirs" , "target.linkdirs" , "target.frameworkdirs" @@ -103,6 +105,8 @@ language("c++") , "config.frameworks" , "target.frameworks" , "toolchain.frameworks" + -- @see https://github.com/xmake-io/xmake/issues/7442 + , "target.runtimes" , "config.syslinks" , "target.syslinks" , "toolchain.syslinks" |