diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-11 22:08:25 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-11 22:08:25 +0000 |
| commit | 7d2d8ad8e031347c7ba3052971c942ddf62b7f6f (patch) | |
| tree | 231fe0a5fde744e5b18d82a37ec09512effaf463 /Makefile | |
| parent | 9b9be36c9f2d5a0d1f2add96c698c904e3e67cce (diff) | |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@239192 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -305,7 +305,10 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree) 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 |