aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-10 16:38:54 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-10 16:38:54 +0000
commit5aa691d24be5879e88494b1cf4164c3bcbb56f28 (patch)
tree54fdcc0985cf3ca05191d5684fbcb7a741c70e65
parenta5ee187b26c102129009bf0848c7f7d3cbda5198 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@262154 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile.rules3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 89c5fc113..9a97373a5 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