Merge pull request #1184 from SaberUK/master+flood

[user/henk/code/inspircd.git] / make / template / main.mk

diff --git a/make/template/main.mk b/make/template/main.mk
index 818b4139d8681a7fbab038f6fa75fd12a83878de..c2babe8f6c5c74c67a704d65bfd6d0f38528e809 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -123,9 +123,9 @@ FOOTER = finishmessage
   CORECXXFLAGS += -DINSPIRCD_STATIC
 @ENDIF
 
-# Add the users CXXFLAGS to the base ones to allow them to override
-# things like -Wfatal-errors if they wish to.
-CORECXXFLAGS += $(CXXFLAGS)
+# Add the users CPPFLAGS/CXXFLAGS to the base ones to allow them to
+# override things like -Wfatal-errors if they wish to.
+CORECXXFLAGS += $(CPPFLAGS) $(CXXFLAGS)
 
 @DO_EXPORT CXX CORECXXFLAGS LDLIBS PICLDFLAGS INSPIRCD_VERBOSE SOCKETENGINE CORELDFLAGS
 @DO_EXPORT SOURCEPATH BUILDPATH INSPIRCD_STATIC