mirror of
https://git.notmuchmail.org/git/notmuch
synced 2025-01-18 09:15:56 +01:00
Fix final link of notmuch binary to use C compiler if possible.
On Linux, a C program that depends on a C library which in turn depends on a C++ can be linked with the C compiler, (avoiding a direct link from the program to the C++ runtime libraries). Other platforms with less fancy linkers need to use the C++ compiler for this linking.
This commit is contained in:
parent
533b02945d
commit
b068f1cc84
1 changed files with 3 additions and 1 deletions
|
@ -32,8 +32,10 @@ GPG_FILE=$(SHA1_FILE).asc
|
||||||
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
|
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
|
||||||
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
|
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
|
||||||
FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch
|
FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Llib -lnotmuch
|
||||||
|
FINAL_NOTMUCH_LINKER = CC
|
||||||
ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
|
ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
|
||||||
FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
|
FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
|
||||||
|
FINAL_NOTMUCH_LINKER = CXX
|
||||||
endif
|
endif
|
||||||
FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
|
FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
|
||||||
|
|
||||||
|
@ -235,7 +237,7 @@ notmuch: $(notmuch_client_modules) lib/libnotmuch.a
|
||||||
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
|
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
|
||||||
|
|
||||||
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
|
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)
|
||||||
$(call quiet,CXX $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@
|
$(call quiet,$(FINAL_NOTMUCH_LINKER) $(CFLAGS)) $(notmuch_client_modules) $(FINAL_NOTMUCH_LDFLAGS) -o $@
|
||||||
|
|
||||||
notmuch.1.gz: notmuch.1
|
notmuch.1.gz: notmuch.1
|
||||||
gzip --stdout $^ > $@
|
gzip --stdout $^ > $@
|
||||||
|
|
Loading…
Reference in a new issue