From afa829d99695cecd0f3a55a753e5bbfb9c474cce Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 9 Feb 2025 16:38:34 +0300 Subject: [PATCH] 3rdparty: libbacktrace: don't define POSIX_SOURCE, it breaks build on Mac --- 3rdparty/libbacktrace/wscript | 4 +--- engine/wscript | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/3rdparty/libbacktrace/wscript b/3rdparty/libbacktrace/wscript index 89db747e..74a2639c 100644 --- a/3rdparty/libbacktrace/wscript +++ b/3rdparty/libbacktrace/wscript @@ -88,8 +88,6 @@ def configure(conf): conf.define('__EXTENSIONS__', 1) conf.define('_DARWIN_USE_64_BIT_INODE', 1) conf.define('_LARGE_FILES', 1) - conf.define('_POSIX_SOURCE', 1) - conf.define('_POSIX_1_SOURCE', 1) conf.check_large_file(compiler='c', execute=False, mandatory=False) # sets _FILE_OFFSET_BITS conf.env.CFLAGS_EXTRAFLAGS = conf.filter_cflags(['-funwind-tables', '-g'], []) @@ -178,7 +176,7 @@ def build(bld): task = bld.stlib( source = ['libbacktrace/' + i for i in sources], - target = 'libbacktrace', + target = 'backtrace', features = 'frandomseed' if bld.env.HAVE_FRANDOM_SEED else '', use = 'EXTRAFLAGS lzma z zstd', includes = '. libbacktrace/', diff --git a/engine/wscript b/engine/wscript index e09db606..f1680c5a 100644 --- a/engine/wscript +++ b/engine/wscript @@ -136,7 +136,7 @@ def build(bld): # public includes for renderers and utils use bld(name = 'engine_includes', export_includes = '. common common/imagelib', use = 'filesystem_includes') - libs = ['engine_includes', 'public', 'dllemu', 'werror', 'libbacktrace'] + libs = ['engine_includes', 'public', 'dllemu', 'werror', 'backtrace'] includes = ['server', 'client', 'client/vgui', 'common/soundlib'] # basic build: dedicated only