1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- From: Ruben Undheim <ruben.undheim@gmail.com>
- Date: Sat, 4 Aug 2018 13:17:43 +0000
- Subject: Using LDFLAGS and CPPFLAGSpassed down from
- dpkg-buildflags such that hardening gets enabled.
- Forwarded: doesn't make sense upstream
- ===================================================================
- ---
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
- diff --git a/Makefile b/Makefile
- index 68651d2..781826d 100644
- --- a/Makefile
- +++ b/Makefile
- @@ -175,27 +175,27 @@ DEP := $(OBJ:.o=.d)
-
- %.o: %.c
- @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
- - $(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $< -o $@
- + $(VERBOSE)$(CC) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< -o $@
-
- %.o: %.cc
- @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
- - $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@
- + $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
-
- %.o: %.cpp
- @echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
- - $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< -o $@
- + $(VERBOSE)$(CXX) -c $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< -o $@
-
- %.d: %.c
- @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
- - $(VERBOSE)$(ABCSRC)/depends.sh $(CC) `dirname $*.c` $(OPTFLAGS) $(INCLUDES) $(CFLAGS) $< > $@
- + $(VERBOSE)$(ABCSRC)/depends.sh $(CC) `dirname $*.c` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
-
- %.d: %.cc
- @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
- - $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cc` $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< > $@
- + $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cc` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< > $@
-
- %.d: %.cpp
- @echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
- - $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cpp` $(OPTFLAGS) $(INCLUDES) $(CXXFLAGS) $< > $@
- + $(VERBOSE)$(ABCSRC)/depends.sh $(CXX) `dirname $*.cpp` $(OPTFLAGS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) $< > $@
-
- ifndef ABC_MAKE_NO_DEPS
- -include $(DEP)
|