Issue #6610 - build on Intel Mac
authorOlle Johansson <oej@edvina.net>
Wed, 5 Apr 2006 20:14:51 +0000 (20:14 +0000)
committerOlle Johansson <oej@edvina.net>
Wed, 5 Apr 2006 20:14:51 +0000 (20:14 +0000)
(Wish I could try this at home :-)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17735 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index 9c058fa..948ab15 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,7 @@ HOST_CC=gcc
 ifeq ($(CROSS_COMPILE),)
   OSARCH=$(shell uname -s)
   OSREV=$(shell uname -r)
 ifeq ($(CROSS_COMPILE),)
   OSARCH=$(shell uname -s)
   OSREV=$(shell uname -r)
+  MARCH=$(shell uname -m)
 else
   OSARCH=$(CROSS_ARCH)
   OSREV=$(CROSS_REV)
 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
   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 
 else
 #These are used for all but Darwin
   ASTLINK=-Wl,-E