From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 11 Jan 2010 22:06:38 +0000 (+0000)
Subject: Including bundle1.o breaks Tiger and Leopard
X-Git-Tag: 11.0.0-beta1~3629
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d079b371c70988de0e3f2b61e0cb7282b83ff4b1;p=thirdparty%2Fasterisk.git

Including bundle1.o breaks Tiger and Leopard
(issue #16449)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@239191 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index ac304dc9a5..82d4187586 100644
--- a/Makefile
+++ b/Makefile
@@ -305,8 +305,11 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__
-  SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace /usr/lib/bundle1.o
-  _ASTLDFLAGS+=  -L/usr/local/lib
+  SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+  ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+    SOLINK+=/usr/lib/bundle1.o
+  endif
+  _ASTLDFLAGS+=-L/usr/local/lib
 else
 # These are used for all but Darwin
   SOLINK=-shared