From: Tilghman Lesher Date: Mon, 10 May 2010 16:38:46 +0000 (+0000) Subject: Merged revisions 262152 via svnmerge from X-Git-Tag: 1.6.0.28-rc2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e81131742ace28567d8974166238594d52090ed6;p=thirdparty%2Fasterisk.git 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@262153 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile.rules b/Makefile.rules index 89c5fc1137..9a97373a55 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -37,6 +37,9 @@ endif 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