1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
Author: Andreas Tille <tille@debian.org>
Last-Changed: Wed, 14 Jan 2015 10:40:22 +0000
Description: Propagate hardening options
--- a/src/Makefile
+++ b/src/Makefile
@@ -77,7 +77,7 @@
BIN = swarm
endif
-LINKFLAGS = $(COMMON) $(LINKOPT)
+LINKFLAGS = $(COMMON) $(LINKOPT) $(LDFLAGS)
CXXFLAGS = $(COMMON) $(WARNINGS)
@@ -95,7 +95,7 @@
all : $(PROG)
swarm : $(OBJS) $(DEPS)
- $(CXX) $(LINKFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(CXX) $(CPPFLAGS) $(LINKFLAGS) -o $@ $(OBJS) $(LIBS)
mkdir -p ../bin
cp -a $(BIN) ../bin
@@ -106,10 +106,10 @@
$(CXX) $(CXXFLAGS) -c -o $@ $<
ssse3.o : ssse3.cc $(DEPS)
- $(CXX) $(CXXFLAGS) -mssse3 -c -o $@ $<
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -mssse3 -c -o $@ $<
sse41.o : sse41.cc $(DEPS)
- $(CXX) $(CXXFLAGS) -msse4.1 -c -o $@ $<
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -msse4.1 -c -o $@ $<
popcnt.o : popcnt.cc $(DEPS)
- $(CXX) $(CXXFLAGS) -mpopcnt -c -o $@ $<
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -mpopcnt -c -o $@ $<
|