[asterisk-commits] seanbright: branch 1.6.0 r220723 - in /branches/1.6.0: ./ Makefile.rules

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Sep 28 14:13:53 2009
New Revision: 220723

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220723
Log:
Merged revisions 220721 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220721 | seanbright | 2009-09-28 15:11:20 -0400 (Mon, 28 Sep 2009) | 10 lines
  
  Merged revisions 220717 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220717 | seanbright | 2009-09-28 15:09:25 -0400 (Mon, 28 Sep 2009) | 3 lines
    
    When selecting DONT_OPTIMIZE in menuselect, explicitly pass -O0 to the compiler
    so we override any default optimization levels for a particular install.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile.rules

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

Modified: branches/1.6.0/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile.rules?view=diff&rev=220723&r1=220722&r2=220723
==============================================================================
--- branches/1.6.0/Makefile.rules (original)
+++ branches/1.6.0/Makefile.rules Mon Sep 28 14:13:53 2009
@@ -39,6 +39,8 @@
 
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     _ASTCFLAGS+=$(OPTIMIZE)
+else
+    _ASTCFLAGS+=-O0
 endif
 
 # shortcuts for common combinations of flags; these must be recursively expanded so that