aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-02 21:41:54 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-06-02 21:41:54 +0000
commit6ff33a97b539034005e1809846af31e753657fd9 (patch)
treec2b9be8fca007461371f5d852ca5ee9b76ac7170 /main
parentc73c9d0c6d0edd3e866f6bfbb5266e76c8734c40 (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: http://svn.digium.com/svn/asterisk/trunk@267303 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-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