diff options
| author | Ismael Luceno <ismael@iodev.co.uk> | 2021-12-28 12:12:13 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-30 11:04:11 +0100 |
| commit | c1be12396088563ed77ed61e54fd4e153469701d (patch) | |
| tree | 4bbbccf1e92399bc7b0d126b9e37b8bfeb96ed8c /sal/Library_sal.mk | |
| parent | d7fb6b22cf7e66eb2594001cc42c6bff8b5a49e2 (diff) | |
Add configure test for the backtrace implementation
Improve robustness by testing explicitly; instead of assuming based on
the OS, test first the libc and then test for libexecinfo.
The assumption was wrong for FreeBSD (included since 2017) and for
musl-based systems (not in libc).
Also, remove INCLUDE_BACKTRACE and clean up a bit.
Ref: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220271
Change-Id: Ib4b7fd4fe2cdf5f76babe47a21bd2990fcf42649
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127538
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sal/Library_sal.mk')
| -rw-r--r-- | sal/Library_sal.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index ac121098273f..30af237cd546 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_is_ure_library_or_dependency,sal)) $(eval $(call gb_Library_set_include,sal,\ $$(INCLUDE) \ -I$(SRCDIR)/sal/inc \ + $(BACKTRACE_CFLAGS) \ )) $(eval $(call gb_Library_add_defs,sal,\ @@ -71,6 +72,7 @@ $(eval $(call gb_Library_add_libs,sal,\ $(if $(filter HAIKU,$(OS)), \ -lnetwork \ ) \ + $(BACKTRACE_LIBS) \ )) ifeq ($(OS),MACOSX) |