From: Evan Hunt <each@isc.org>
Date: Sat, 27 Oct 2018 06:34:34 +0000 (-0700)
Subject: avoid makefile conditional
X-Git-Tag: v9.13.4~81^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff747365dbbdfe72a8b6c817b021e3b40cde7a54;p=thirdparty%2Fbind9.git

avoid makefile conditional
---

diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in
index 83ba5f07eae..75c073e400b 100644
--- a/lib/dns/tests/Makefile.in
+++ b/lib/dns/tests/Makefile.in
@@ -32,9 +32,6 @@ LIBS =		@LIBS@ @ATFLIBS@
 
 CMOCKA_CFLAGS =	@CMOCKA_CFLAGS@
 CMOCKA_LIBS =	@CMOCKA_LIBS@
-ifeq ($(LD_WRAP),true)
-CMOCKA_MEM =	-Wl,--wrap=isc__mem_put,--wrap=isc__mem_get,--wrap=isc_mem_attach,--wrap=isc_mem_detach
-endif
 
 OBJS =		dnstest.@O@
 SRCS =		acl_test.c \
@@ -236,10 +233,12 @@ time_test@EXEEXT@: time_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 			time_test.@O@ dnstest.@O@ ${DNSLIBS} \
 				${ISCLIBS} ${LIBS}
 
+WRAP = -Wl,--wrap=isc__mem_put,--wrap=isc__mem_get,--wrap=isc_mem_attach,--wrap=isc_mem_detach
 tkey_test@EXEEXT@: tkey_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	if test "${LD_WRAP}" = true; then wrap="${WRAP}"; fi; \
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} ${LDFLAGS} -o $@ \
 			tkey_test.@O@ ${DNSLIBS} \
-			${ISCLIBS} ${LIBS} ${CMOCKA_LIBS} ${CMOCKA_MEM}
+			${ISCLIBS} ${LIBS} ${CMOCKA_LIBS} $$wrap
 
 tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \