[svn-commits] russell: branch 1.6.2 r267304 - in /branches/1.6.2: ./ main/Makefile

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jun  2 16:42:41 2010
New Revision: 267304

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=267304
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/Makefile

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/Makefile?view=diff&rev=267304&r1=267303&r2=267304
==============================================================================
--- branches/1.6.2/main/Makefile (original)
+++ branches/1.6.2/main/Makefile Wed Jun  2 16:42:41 2010
@@ -114,7 +114,7 @@
 	$(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