Skip to content

Commit bc762cc

Browse files
committed
build: move BACKTRACE_LIBS determination to configure.ac
Library-specific details are ill-suited for Makefiles
1 parent b73deae commit bc762cc

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

configure.ac

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,14 +1221,18 @@ if test "$use_thread_local" = "yes" || test "$use_thread_local" = "auto"; then
12211221
LDFLAGS="$TEMP_LDFLAGS"
12221222
fi
12231223

1224-
AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
1225-
if test "$enable_stacktraces" != no; then
1224+
BACKTRACE_LIBS=
1225+
if test "$enable_stacktraces" != "no"; then
1226+
AC_CHECK_HEADERS([execinfo.h], [], [enable_stacktraces=no])
12261227
dnl ensure backtrace() is found, check -lexecinfo if necessary
1227-
if test "$TARGET_OS" != "windows"; then
1228-
AC_SEARCH_LIBS([backtrace], [execinfo], [], [
1229-
AC_MSG_ERROR([Unable to find backtrace()])
1230-
])
1231-
fi
1228+
AC_SEARCH_LIBS([backtrace], [execinfo], [
1229+
if test "$TARGET_OS" = "windows"; then
1230+
BACKTRACE_LIBS="$BACKTRACE_LIBS -ldbghelp"
1231+
fi
1232+
BACKTRACE_LIBS="$BACKTRACE_LIBS -lbacktrace"
1233+
], [
1234+
AC_MSG_ERROR([Unable to find backtrace()])
1235+
])
12321236
fi
12331237

12341238
AM_CONDITIONAL([ENABLE_STACKTRACES], [test "$enable_stacktraces" = "yes"])
@@ -1983,6 +1987,7 @@ AC_SUBST(USE_QRCODE)
19831987
AC_SUBST(TESTDEFS)
19841988
AC_SUBST(MINIUPNPC_CPPFLAGS)
19851989
AC_SUBST(MINIUPNPC_LIBS)
1990+
AC_SUBST(BACKTRACE_LIBS)
19861991
AC_SUBST(GMP_LIBS)
19871992
AC_SUBST(NATPMP_CPPFLAGS)
19881993
AC_SUBST(NATPMP_LIBS)

src/Makefile.am

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,10 @@ if TARGET_WINDOWS
3636
LDFLAGS_WRAP_EXCEPTIONS += -Wl,-wrap,_assert -Wl,-wrap,_wassert
3737
else
3838
LDFLAGS_WRAP_EXCEPTIONS += -Wl,-wrap,__assert_fail
39-
endif
40-
endif
41-
endif
42-
43-
if TARGET_WINDOWS
44-
BACKTRACE_LIBS = -ldbghelp -lbacktrace
45-
else
46-
BACKTRACE_LIBS = -lbacktrace
47-
endif
48-
endif #ENABLE_STACKTRACES
39+
endif # TARGET_WINDOWS
40+
endif # CRASH_HOOKS_WRAPPED_CXX_ABI
41+
endif # ENABLE_CRASH_HOOKS
42+
endif # ENABLE_STACKTRACES
4943

5044
BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS)
5145
BITCOIN_INCLUDES+=-isystem$(srcdir)/dashbls/include -isystem$(srcdir)/dashbls/depends/relic/include -isystem$(srcdir)/dashbls/depends/minialloc/include

0 commit comments

Comments
 (0)