summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Pennock <pdp@exim.org>2017-02-11 19:37:04 -0500
committerPhil Pennock <pdp@exim.org>2017-02-11 19:41:03 -0500
commitc74a319dd3fbc47e0ad2adbde69f3a9ad0e7c5cd (patch)
treedbffdb82a6ee1e68374817676802d144dcb9e1f1
parentd6a72690b2361a4f9aa95ce34769c0d7433e02d0 (diff)
downloadexim4-c74a319dd3fbc47e0ad2adbde69f3a9ad0e7c5cd.tar.gz
Unbreak test_dbfn make-target
doc/dbm.discuss.txt describes how to make and use `test_dbfn` for testing DB functionality. Commit cf0812d5 adds a call to assert_no_variables into store.c which depends upon expand.c functionality and we can't link that in for test_dbfn without pulling in half of Exim. So adjust the test_dbfn target to rebuild store.o in COMPILE_UTILITY mode and link against that variant, then remove the custom-built store.o after the executable has been linked. (cherry picked from commit 92e840383faa41c28f4ef099ee5fe0b6b18c2738) Signed-off-by: Phil Pennock <pdp@exim.org>
-rw-r--r--src/OS/Makefile-Base3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 7ba7b0474..f6b42f353 100644
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -779,10 +779,11 @@ sa-os.o: $(HDRS) os.c
test_dbfn: config.h dbfn.c dummies.o sa-globals.o sa-os.o store.o \
string.o tod.o version.o utf8.o
$(CC) -c $(CFLAGS) $(INCLUDE) -DSTAND_ALONE dbfn.c
+ $(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY store.c
$(LNCC) -o test_dbfn $(LFLAGS) dbfn.o \
dummies.o sa-globals.o sa-os.o store.o string.o \
tod.o version.o utf8.o $(LIBS) $(DBMLIB) $(LDFLAGS)
- rm -f dbfn.o
+ rm -f dbfn.o store.o
test_host: config.h child.c host.c dns.c dummies.c sa-globals.o os.o \
store.o string.o tod.o tree.o