commit: d9a4a0c97f4840e3c6b84fa6302ed511dd73705b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 8 02:11:31 2025 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jan 8 02:11:31 2025 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=d9a4a0c9
libsandbox: simplify reference to libsbutil
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
libsandbox/local.mk | 9 +--------
libsbutil/sb_backtrace.c | 1 +
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/libsandbox/local.mk b/libsandbox/local.mk
index d2fb1d1..b3ccd39 100644
--- a/libsandbox/local.mk
+++ b/libsandbox/local.mk
@@ -9,14 +9,7 @@ lib_LTLIBRARIES += %D%/libsandbox.la
-I$(top_srcdir)/libsbutil/include
%C%_libsandbox_la_CFLAGS = $(CFLAG_EXCEPTIONS)
-# Could use the following to libsandbox_la_LIBADD, but then libtool links it
-# with --whole-archive, and libsandbox.so increase with a few KB in size:
-# libsbutil/libsbutil.la
-libsbutil/.libs/libsbutil.a: libsbutil/libsbutil.la
-%C%_libsandbox_la_LIBSBLIB = libsbutil/.libs/libsbutil.a
-%C%_libsandbox_la_LIBADD = \
- $(%C%_libsandbox_la_LIBSBLIB) \
- $(LIBDL)
+%C%_libsandbox_la_LIBADD = libsbutil/libsbutil.la $(LIBDL)
# Do not add -nostdlib or -nostartfiles, as then our constructor
# and destructor will not be executed ...
%C%_libsandbox_la_LDFLAGS = \
diff --git a/libsbutil/sb_backtrace.c b/libsbutil/sb_backtrace.c
index e3d1ed7..f06b781 100644
--- a/libsbutil/sb_backtrace.c
+++ b/libsbutil/sb_backtrace.c
@@ -10,6 +10,7 @@
#include "headers.h"
#include "sbutil.h"
+__attribute__((weak))
void __sb_dump_backtrace(void)
{
}
