summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2010-06-02 21:41:54 +0000
committerRussell Bryant <russell@russellbryant.com>2010-06-02 21:41:54 +0000
commit6aa4002270f7da1680f6f8a6ceefbcaf01841afe (patch)
treec2b9be8fca007461371f5d852ca5ee9b76ac7170
parentafcbc93daede49f5475d37355f16210120d4b1c5 (diff)
Ensure the -Wno-strict-aliasing flag makes it, even if ASTCFLAGS has been specified.
When ASTCFLAGS was specified with the make command, Makefile.rules was using the specified value from the command line and not the one here, making it so this flag would go missing. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@267303 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--main/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile
index ada40fe61..809aae747 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -102,7 +102,7 @@ editline/libedit.a: CHECK_SUBDIR
$(MAKE) -C editline libedit.a
db1-ast/libdb1.a: CHECK_SUBDIR
- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
+ _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
ast_expr2.c ast_expr2.h: ast_expr2.y