From 156e9d2f0c733ec43cefec9545c0ac5163373fdd Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 2 Jun 2010 21:42:41 +0000 Subject: [PATCH] Merged revisions 267303 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r267303 | russell | 2010-06-02 16:41:54 -0500 (Wed, 02 Jun 2010) | 6 lines 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/branches/1.6.2@267304 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Makefile b/main/Makefile index 24337cf447..f5ef788a87 100644 --- a/main/Makefile +++ b/main/Makefile @@ -114,7 +114,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