summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-04-05 20:14:51 +0000
committerOlle Johansson <oej@edvina.net>2006-04-05 20:14:51 +0000
commit2efcfc1549e580d69c39bb109c021a58ae70651b (patch)
tree87425b82d26d4188f924955386cfdd6d707c6a3e /Makefile
parent3f76f9e44296a69a34c8994f9aaf57e42bc3c497 (diff)
Issue #6610 - build on Intel Mac
(Wish I could try this at home :-) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9c058fae4..948ab152b 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ HOST_CC=gcc
ifeq ($(CROSS_COMPILE),)
OSARCH=$(shell uname -s)
OSREV=$(shell uname -r)
+ MARCH=$(shell uname -m)
else
OSARCH=$(CROSS_ARCH)
OSREV=$(CROSS_REV)
@@ -397,8 +398,11 @@ ifeq ($(OSARCH),Darwin)
AUDIO_LIBS=-framework CoreAudio
ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
- OBJS+=poll.o
- ASTCFLAGS+=-DPOLLCOMPAT
+ # Mac on Intel CoreDuo does not need poll compatibility layer
+ ifneq ($(MARCH),i386)
+ OBJS+=poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
+ endif
else
#These are used for all but Darwin
ASTLINK=-Wl,-E