diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-08 15:41:45 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-08 15:41:45 +0000 |
| commit | 23456495b4cebc9c8a048c828c91189e19e5903f (patch) | |
| tree | 716059087c0e298a938b29174eefd50f3f0f0344 /Makefile.rules | |
| parent | 39be2603ae1829a1865ca293b6be3dfeb6c1aeef (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@269009 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules index 89c5fc113..2d64392f5 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) |