[asterisk-commits] tilghman: trunk r239191 - /trunk/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan 11 16:06:38 2010
New Revision: 239191

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239191
Log:
Including bundle1.o breaks Tiger and Leopard
(issue #16449)

Modified:
    trunk/Makefile

Modified: trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/Makefile?view=diff&rev=239191&r1=239190&r2=239191
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jan 11 16:06:38 2010
@@ -305,8 +305,11 @@
 
 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