[asterisk-commits] tilghman: trunk r262152 - in /trunk: ./ Makefile.rules

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon May 10 11:36:25 2010
New Revision: 262152

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262152
Log:
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:
    trunk/   (props changed)
    trunk/Makefile.rules

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile.rules?view=diff&rev=262152&r1=262151&r2=262152
==============================================================================
--- trunk/Makefile.rules (original)
+++ trunk/Makefile.rules Mon May 10 11:36:25 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