diff options
| author |  Carl Worth <cworth@cworth.org> | 2010-10-29 14:25:09 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-10-29 14:32:48 -0700 |
| commit | 0b4474f4fa0b30fba6a9b1c0014d87212bad1e20 (patch) | |
| tree | 9544a3c71e12c8bd7ec234cd3def69f5b9d59c72 | |
| parent | adbfff40caeef27b912dbeb2bf3d1038a6e6cab0 (diff) | |
Makefile: Fix notmuch binary to directly link against Xapian and GMime.
Without this, trying to link with the gold linker would fail, (which meant
that notmuch could not be compiled out of the box on recent Fedora, nor
even on Debian when the binutils-gold package is installed).
| -rw-r--r-- | Makefile.local | 2 | ||||
| -rw-r--r-- | TODO | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.local b/Makefile.local index ade84121..971ddd52 100644 --- a/Makefile.local +++ b/Makefile.local @@ -31,7 +31,7 @@ GPG_FILE=$(SHA1_FILE).asc # Smash together user's values with our extra values FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) -FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) FINAL_NOTMUCH_LINKER = CC ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS) @@ -247,8 +247,3 @@ database for the same corpus of email. Makefile should print message teaching user about LD_LIBRARY_PATH (or similar) if libdir is not set to a directory examined by ldconfig. - -Fix notmuch build system to work with gold, (apt-get -binutils-gold). Need the notmuch binary to explicitly link againsts -libraries it depends on, (rather than just getting them via -libnotmuch). |