From 2d8f747e842f671009fcd74fd2ff60b5119d8768 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 13 Feb 2025 19:21:07 +0300 Subject: [PATCH] wscript: disable using system-wide libbacktrace, as it might not support features we need --- wscript | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/wscript b/wscript index 589ef51f..970dd20f 100644 --- a/wscript +++ b/wscript @@ -84,7 +84,7 @@ SUBDIRS = [ Subproject('filesystem'), Subproject('stub/server'), Subproject('dllemu'), - Subproject('3rdparty/libbacktrace', lambda x: not x.env.HAVE_SYSTEM_LIBBACKTRACE), + Subproject('3rdparty/libbacktrace'), # disable only by engine feature, makes no sense to even parse subprojects in dedicated mode Subproject('3rdparty/extras', lambda x: x.env.CLIENT and x.env.DEST_OS != 'android'), @@ -485,14 +485,8 @@ def configure(conf): conf.env.SHAREDIR = conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX if not conf.options.BUILD_BUNDLED_DEPS: - frag='''#include -#include -#if !BACKTRACE_SUPPORTS_THREADS -#error -#endif -int main(int argc, char **argv) { return backtrace_create_state(argv[0], 1, 0, 0) != 0; }''' - - conf.env.HAVE_SYSTEM_LIBBACKTRACE = conf.check_cc(lib='backtrace', fragment=frag, uselib_store='backtrace', mandatory=False) + # there was a check for system libbacktrace but we can't be sure if it supports fileline or not + # therefore, always build libbacktrace ourselves if conf.env.CLIENT: for i in ('ogg','opusfile','vorbis','vorbisfile'):