aboutsummaryrefslogtreecommitdiff
path: root/xmake.lua
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2025-11-01 14:04:35 +0100
committerGitHub Enterprise <[email protected]>2025-11-01 14:04:35 +0100
commita58da97f98697580bf128ed5723ba720cc30f0dc (patch)
tree798e392ddf76128a506293dc0803aaf852203dcd /xmake.lua
parentfix use-after-free in TEST_CASE("compactcas.threadedinsert") (#620) (diff)
downloadzen-a58da97f98697580bf128ed5723ba720cc30f0dc.tar.xz
zen-a58da97f98697580bf128ed5723ba720cc30f0dc.zip
Various fixes to address issues flagged by gcc / non-UE toolchain build (#621)
* gcc: avoid using memset on nontrivial struct * redundant `return std::move` * fixed various compilation issues flagged by gcc * fix issue in xmake.lua detecting whether we are building with the UE toolchain or not * add GCC ignore -Wundef (comment is inaccurate) * remove redundant std::move * don't catch exceptions by value * unreferenced variables * initialize "by the book" instead of memset * remove unused exception reference * add #include <cstring> to fix gcc build * explicitly poulate KeyValueMap by traversing input spans fixes gcc compilation * remove unreferenced variable * eliminate redundant `std::move` which gcc complains about * fix gcc compilation by including <cstring> * tag unreferenced variable to fix gcc compilation * fixes for various cases of naming members the same as their type
Diffstat (limited to 'xmake.lua')
-rw-r--r--xmake.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmake.lua b/xmake.lua
index 6c4ba9ff7..b5f0a26b5 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -40,7 +40,7 @@ end
-- If we're using the UE cross-compile toolchain, we need to ensure we link statically
-- against the toolchain libc++ and libc++abi, as the system ones can differ in ABI
-- leading to nasty crashes
-if is_plat("linux") and "$(env UE_TOOLCHAIN_DIR)" ~= "" then
+if is_plat("linux") and os.getenv("UE_TOOLCHAIN_DIR") then
add_ldflags("-static-libstdc++")
add_ldflags("$(projectdir)/thirdparty/ue-libcxx/lib64/libc++.a")
add_ldflags("$(projectdir)/thirdparty/ue-libcxx/lib64/libc++abi.a")