[asterisk-commits] tilghman: branch 1.6.2 r239192 - in /branches/1.6.2: ./ Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Jan 11 16:08:25 2010
New Revision: 239192

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239192
Log:
Merged revisions 239191 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239191 | tilghman | 2010-01-11 16:06:38 -0600 (Mon, 11 Jan 2010) | 3 lines
  
  Including bundle1.o breaks Tiger and Leopard
  (issue #16449)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/Makefile

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/Makefile?view=diff&rev=239192&r1=239191&r2=239192
==============================================================================
--- branches/1.6.2/Makefile (original)
+++ branches/1.6.2/Makefile Mon Jan 11 16:08:25 2010
@@ -305,7 +305,10 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   _ASTCFLAGS+=-D__Darwin__
-  SOLINK=-dynamic -bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace /usr/lib/bundle1.o
+  SOLINK=-dynamic -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
 else
 # These are used for all but Darwin
   SOLINK=-shared