[svn-commits] tilghman: branch 1.6.0 r262153 - in /branches/1.6.0: ./ Makefile.rules

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon May 10 11:38:46 2010
New Revision: 262153

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

................
  r262152 | tilghman | 2010-05-10 11:36:25 -0500 (Mon, 10 May 2010) | 17 lines
  
  Merged revisions 262151 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r262151 | tilghman | 2010-05-10 11:34:21 -0500 (Mon, 10 May 2010) | 10 lines
    
    Allow compilation on Mac OS X 10.4 (Tiger)
    
    (closes issue #17297)
     Reported by: jcovert
     Patches: 
           20100506__issue17297.diff.txt uploaded by tilghman (license 14)
    
    (closes issue #17302)
     Reported by: jcovert
  ........
................

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=262153&r1=262152&r2=262153
==============================================================================
--- branches/1.6.0/Makefile.rules (original)
+++ branches/1.6.0/Makefile.rules Mon May 10 11:38:46 2010
@@ -37,6 +37,9 @@
 
 OPTIMIZE?=-O6
 ifneq ($(findstring darwin,$(OSARCH)),)
+  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.4)
+    OPTIMIZE+=-fno-inline
+  endif
   ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
     # Snow Leopard has an issue with this optimization flag on large files (like chan_sip)
     OPTIMIZE+=-fno-inline-functions