LGTM. I think we build the main notmuch binary with g++ for the same reason. Quoth Peter Feigl on Dec 04 at 2:47 pm: > Without this change, GCC complains as follows: > gcc test/random-corpus.o test/database-test.o notmuch-config.o command-line-arguments.o lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a -o test/random-corpus -lgmime-2.6 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -Wl,-rpath,/usr/lib -ltalloc -lxapian > /usr/bin/ld: lib/libnotmuch.a(database.o): undefined reference to symbol '_ZNSs4_Rep10_M_destroyERKSaIcE@@GLIBCXX_3.4' > /usr/bin/ld: note: '_ZNSs4_Rep10_M_destroyERKSaIcE@@GLIBCXX_3.4' is defined in DSO /usr/lib/libstdc++.so.6 so try adding it to the linker command line > /usr/lib/libstdc++.so.6: could not read symbols: Invalid operation > collect2: error: ld returned 1 exit status > make: *** [test/random-corpus] Error 1 > --- > test/Makefile.local | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/test/Makefile.local b/test/Makefile.local > index 6a9f15e..2ec6595 100644 > --- a/test/Makefile.local > +++ b/test/Makefile.local > @@ -22,7 +22,7 @@ random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \ > parse-time-string/libparse-time-string.a > > $(dir)/random-corpus: $(random_corpus_deps) > - $(call quiet,CC) $(CFLAGS_FINAL) $^ -o $@ $(CONFIGURE_LDFLAGS) > + $(call quiet,CXX) $(CFLAGS_FINAL) $^ -o $@ $(CONFIGURE_LDFLAGS) > > $(dir)/smtp-dummy: $(smtp_dummy_modules) > $(call quiet,CC) $^ -o $@