mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 23:25:38 +00:00
Code Issues Releases Wiki Activity

Merge branch '639-fix-freebsd-build' into 'master'

Browse Source 
avoid makefile conditional

Closes #639

See merge request isc-projects/bind9!920
This commit is contained in:
Ondřej Surý
2018-10-28 10:18:47 -04:00
parent 241594299b ff747365db
commit 87b042a48d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/dns/tests/Makefile.in
View File

@@ -32,9 +32,6 @@ LIBS = @LIBS@ @ATFLIBS@
CMOCKA_CFLAGS = @CMOCKA_CFLAGS@ CMOCKA_CFLAGS = @CMOCKA_CFLAGS@
CMOCKA_LIBS = @CMOCKA_LIBS@ 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@ OBJS = dnstest.@O@
SRCS = acl_test.c \ SRCS = acl_test.c \
@@ -236,10 +233,12 @@ time_test@EXEEXT@: time_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
time_test.@O@ dnstest.@O@ ${DNSLIBS} \ time_test.@O@ dnstest.@O@ ${DNSLIBS} \
${ISCLIBS} ${LIBS} ${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} 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 $@ \ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${CMOCKA_CFLAGS} ${LDFLAGS} -o $@ \
tkey_test.@O@ ${DNSLIBS} \ 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} tsig_test@EXEEXT@: tsig_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \