summaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2010-06-08 15:41:23 +0000
committerRussell Bryant <russell@russellbryant.com>2010-06-08 15:41:23 +0000
commitf1bc2809b1c3f08c569f4be3af916fb64541ad0d (patch)
treedfa7c2191e895307bae767d6290f6569b74985ca /Makefile.rules
parent285ef284efa124db6de7d6334ce6c8c2d59d811c (diff)
Ensure CONFIG_FLAGS makes it into the build rules when doing out of tree builds.
(closes issue #16685) Reported by: pprindeville git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@269008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index f76d84b15..03bc7e81a 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -49,6 +49,10 @@ else
_ASTCFLAGS+=-O0
endif
+ifeq ($(findstring $(CONFIG_CFLAGS),$(_ASTCFLAGS)),)
+ _ASTCFLAGS+=$(CONFIG_CFLAGS)
+endif
+
# shortcuts for common combinations of flags; these must be recursively expanded so that
# per-target settings will be applied
CC_CFLAGS=$(PTHREAD_CFLAGS) $(_ASTCFLAGS) $(ASTCFLAGS)