From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 8 Jun 2010 15:41:45 +0000 (+0000)
Subject: Merged revisions 269008 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=286591a90a4711ef85e7387d4ef690bee97e1379;p=thirdparty%2Fasterisk.git

Merged revisions 269008 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r269008 | russell | 2010-06-08 10:41:23 -0500 (Tue, 08 Jun 2010) | 5 lines

  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/branches/1.6.2@269009 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile.rules b/Makefile.rules
index 89c5fc1137..2d64392f5c 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)