diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-09-20 18:39:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 18:39:43 +0200 |
| commit | 7f2a793d189844425e141929e08bd903a6d8c8d6 (patch) | |
| tree | 33200d2cf04b476cd0befdeb4caab85dcbb2867e | |
| parent | 2e2944e6e632291bd3bdf8daec956208f780db2c (diff) | |
| parent | fff28e7ff0cd33935e64901678941f3592537608 (diff) | |
Merge pull request #1225 from SaberUK/master+cppflags
Use the environment's CPPFLAGS as well as its CXXFLAGS.
| -rw-r--r-- | make/template/main.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make/template/main.mk b/make/template/main.mk index 818b4139d..c2babe8f6 100644 --- 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 |