mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-28 04:34:54 -04:00
Add Userspace-RCU to global CFLAGS and LIBS
The Userspace-RCU headers are now needed for more parts of the libisc and libdns, thus we need to add it globally to prevent compilation failures on systems with non-standard Userspace-RCU installation path.
This commit is contained in:
parent
00f1823366
commit
fd3522c37b
3 changed files with 3 additions and 4 deletions
|
|
@ -244,6 +244,9 @@ AC_DEFINE_UNQUOTED([RCU_FLAVOR], ["$RCU_FLAVOR"], [Chosen Userspace-RCU flavor])
|
|||
PKG_CHECK_VERSION([RCU_VERSION], [$RCU_FLAVOR])
|
||||
AC_DEFINE_UNQUOTED([RCU_VERSION], ["$RCU_VERSION"], [Compile-time Userspace-RCU version])
|
||||
|
||||
CFLAGS="$CFLAGS $LIBURCU_CFLAGS"
|
||||
LIBS="$LIBS $LIBURCU_LIBS"
|
||||
|
||||
# Fuzzing is not included in pairwise testing as fuzzing tools are
|
||||
# not present in the relevant Docker image.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -263,7 +263,6 @@ libdns_la_CPPFLAGS = \
|
|||
$(AM_CPPFLAGS) \
|
||||
$(LIBDNS_CFLAGS) \
|
||||
$(LIBISC_CFLAGS) \
|
||||
$(LIBURCU_CFLAGS) \
|
||||
$(LIBUV_CFLAGS) \
|
||||
$(OPENSSL_CFLAGS)
|
||||
|
||||
|
|
@ -273,7 +272,6 @@ libdns_la_LDFLAGS = \
|
|||
|
||||
libdns_la_LIBADD = \
|
||||
$(LIBISC_LIBS) \
|
||||
$(LIBURCU_LIBS) \
|
||||
$(LIBUV_LIBS) \
|
||||
$(OPENSSL_LIBS)
|
||||
|
||||
|
|
|
|||
|
|
@ -212,7 +212,6 @@ endif USE_ISC_RWLOCK
|
|||
libisc_la_CPPFLAGS = \
|
||||
$(AM_CPPFLAGS) \
|
||||
$(LIBISC_CFLAGS) \
|
||||
$(LIBURCU_CFLAGS) \
|
||||
$(LIBUV_CFLAGS) \
|
||||
$(OPENSSL_CFLAGS) \
|
||||
$(ZLIB_CFLAGS)
|
||||
|
|
@ -222,7 +221,6 @@ libisc_la_LDFLAGS = \
|
|||
-release "$(PACKAGE_VERSION)"
|
||||
|
||||
libisc_la_LIBADD = \
|
||||
$(LIBURCU_LIBS) \
|
||||
$(LIBUV_LIBS) \
|
||||
$(OPENSSL_LIBS) \
|
||||
$(ZLIB_LIBS)
|
||||
|
|
|
|||
Loading…
Reference in a new issue