diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-11 22:06:38 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-11 22:06:38 +0000 |
commit | d079b371c70988de0e3f2b61e0cb7282b83ff4b1 (patch) | |
tree | 13ec275784aa441b6df068dcd2e60cfdad8b1ee1 /Makefile | |
parent | b4504ada8b188cdbba8f5d7321d3881410256db7 (diff) |
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
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 |