diff options
| author | David Bremner <david@tethera.net> | 2021-12-24 14:29:05 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-12-31 07:08:06 -0400 |
| commit | e9c55864cde6e9b9653b9963a36f633f34a57779 (patch) | |
| tree | ea67b3ae6fcfef4ba02eac323fd5ffeed0ff9d3e /Makefile.global | |
| parent | 911d9a916e4dc2de7348d138aabd0ebe51242efd (diff) | |
build: move {C,CXX}FLAGS to the end of FINAL_{C,CXX}FLAGS
In addition to avoiding problems with user specified include paths
picking up an installed version of notmuch.h, this should also enable
users to override more options (in particular they could override
warning options since the last one takes effect).
[1]: id:7851CAB5-4556-4931-A0A2-37003E56C927@ryandesign.com
Diffstat (limited to 'Makefile.global')
| -rw-r--r-- | Makefile.global | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.global b/Makefile.global index b712dd7b..7a7a3c6d 100644 --- a/Makefile.global +++ b/Makefile.global @@ -50,8 +50,8 @@ DETACHED_SIG_FILE=$(TAR_FILE).asc PV_FILE=bindings/python/notmuch/version.py # Smash together user's values with our extra values -FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CPPFLAGS) $(CONFIGURE_CFLAGS) -FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CPPFLAGS) $(CONFIGURE_CXXFLAGS) +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(WARN_CFLAGS) $(extra_cflags) $(CPPFLAGS) $(CONFIGURE_CFLAGS) $(CFLAGS) +FINAL_CXXFLAGS = $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CPPFLAGS) $(CONFIGURE_CXXFLAGS) $(CXXFLAGS) FINAL_NOTMUCH_LDFLAGS = -Lutil -lnotmuch_util -Llib -lnotmuch $(LDFLAGS) ifeq ($(LIBDIR_IN_LDCONFIG),0) FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) |
