aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-11 22:06:38 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-11 22:06:38 +0000
commitc196e591cefc168ddc8fabdd7094eaa1e9749eeb (patch)
tree13ec275784aa441b6df068dcd2e60cfdad8b1ee1 /Makefile
parent31afdebaba3e2e5aee66c3be6db2f56d750ddb1b (diff)
Including bundle1.o breaks Tiger and Leopard
(issue #16449) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@239191 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ac304dc9a..82d418758 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