diff options
| author | Stefan Boberg <[email protected]> | 2025-10-26 20:37:48 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2025-10-26 20:37:48 +0100 |
| commit | c834b21b06b3e6c338d355a79368ce93676b576c (patch) | |
| tree | 15ec75ee607a17d547a50f947b208b48cd4fd775 /src | |
| parent | fix mbedtls crypto impl (diff) | |
| parent | corrected env var -> XMAKE_GLOBALDIR (diff) | |
| download | zen-c834b21b06b3e6c338d355a79368ce93676b576c.tar.xz zen-c834b21b06b3e6c338d355a79368ce93676b576c.zip | |
Merge branch 'sb/fix-libatomic' of ssh://arn-wd-l1704:2222/ue-foundation/zen into sb/fix-libatomic
Diffstat (limited to 'src')
| -rw-r--r-- | src/zencore/xmake.lua | 2 | ||||
| -rw-r--r-- | src/zenhttp/xmake.lua | 19 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/zencore/xmake.lua b/src/zencore/xmake.lua index 26a6f0bdf..7ca3d3502 100644 --- a/src/zencore/xmake.lua +++ b/src/zencore/xmake.lua @@ -64,7 +64,7 @@ target('zencore') -- be specified after the former with GCC-like toolchains. xmake however -- is unaware of this and simply globs files from vcpkg's output. The -- line below forces breakpad_client to be to the right of sentry_native - add_syslinks("breakpad_client") + -- add_syslinks("breakpad_client") end if is_plat("macosx") then diff --git a/src/zenhttp/xmake.lua b/src/zenhttp/xmake.lua index 434330501..923e339d5 100644 --- a/src/zenhttp/xmake.lua +++ b/src/zenhttp/xmake.lua @@ -9,24 +9,9 @@ target('zenhttp') add_includedirs("include", {public=true}) add_deps("zencore", "zentelemetry", "transport-sdk", "asio", "cpr") add_deps("gsl-lite") - add_packages( - "curl", -- required by cpr - "http_parser" - ) + add_packages("http_parser") add_options("httpsys") if is_plat("linux") then - -- The 'vcpkg::openssl' package is two libraries; ssl and crypto, with - -- ssl being dependent on symbols in crypto. When GCC-like linkers read - -- object files from their command line, those object files only resolve - -- symbols of objects previously encountered. Thus crypto must appear - -- after ssl so it can fill out ssl's unresolved symbol table. Xmake's - -- vcpkg support is basic and works by parsing .list files. Openssl's - -- archives are listed alphabetically causing crypto to be _before_ ssl - -- and resulting in link errors. The links are restated here to force - -- xmake to use the correct order, and "syslinks" is used to force the - -- arguments to the end of the line (otherwise they can appear before - -- curl and cause more errors). - add_syslinks("crypto") - add_syslinks("dl") + add_syslinks("dl") -- TODO: is libdl needed? end |