mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-24 20:08:10 +01:00
build: pass CPPFLAGS to C and C++ compilers
This is used in particular by hardening flags.
This commit is contained in:
parent
51b14fb3c3
commit
be96004b7d
1 changed files with 4 additions and 4 deletions
|
@ -39,8 +39,8 @@ GPG_FILE=$(SHA1_FILE).asc
|
||||||
PV_FILE=bindings/python/notmuch/version.py
|
PV_FILE=bindings/python/notmuch/version.py
|
||||||
|
|
||||||
# Smash together user's values with our extra values
|
# Smash together user's values with our extra values
|
||||||
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
|
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
|
||||||
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
|
FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
|
||||||
FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
|
FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)
|
||||||
FINAL_NOTMUCH_LINKER = CC
|
FINAL_NOTMUCH_LINKER = CC
|
||||||
ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
|
ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
|
||||||
|
@ -237,11 +237,11 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))
|
||||||
|
|
||||||
%.o: %.cc $(global_deps)
|
%.o: %.cc $(global_deps)
|
||||||
@mkdir -p .deps/$(@D)
|
@mkdir -p .deps/$(@D)
|
||||||
$(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
|
$(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
|
||||||
|
|
||||||
%.o: %.c $(global_deps)
|
%.o: %.c $(global_deps)
|
||||||
@mkdir -p .deps/$(@D)
|
@mkdir -p .deps/$(@D)
|
||||||
$(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
|
$(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d
|
||||||
|
|
||||||
.PHONY : clean
|
.PHONY : clean
|
||||||
clean:
|
clean:
|
||||||
|
|
Loading…
Reference in a new issue