From: David M. Lee Date: Wed, 19 Jun 2013 22:52:23 +0000 (+0000) Subject: Fix build problem on OS X Mountain Lion (10.8) X-Git-Tag: 13.0.0-beta1~1645 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e6652518d43f26ac70ef6378b282464dcd62c50;p=thirdparty%2Fasterisk.git Fix build problem on OS X Mountain Lion (10.8) For about forever, our build flags for OS X have been slightly off, but good enough to build and run. Apparently they aren't good enough any more. Previously, we would compile with macosx-version-min unset and link with it set. This combination, using GCC 4.8, on Mountain Lion, would create a bad executable ("Illegal Instruction: 4", or something like that) This patch consistently sets macosx-version-min for both compiling and linking, which makes everything happy enough to build and run. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392279 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 884db7c3b8..41b337c4a5 100644 --- a/Makefile +++ b/Makefile @@ -251,8 +251,8 @@ MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs) MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree) ifneq ($(findstring darwin,$(OSARCH)),) - _ASTCFLAGS+=-D__Darwin__ - _SOLINK=-Xlinker -macosx_version_min -Xlinker 10.6 -Xlinker -undefined -Xlinker dynamic_lookup + _ASTCFLAGS+=-D__Darwin__ -mmacosx-version-min=10.6 + _SOLINK=-mmacosx-version-min=10.6 -Xlinker -undefined -Xlinker dynamic_lookup _SOLINK+=/usr/lib/bundle1.o SOLINK=-bundle $(_SOLINK) DYLINK=-Xlinker -dylib $(_SOLINK) diff --git a/main/Makefile b/main/Makefile index f249a294a2..2949653651 100644 --- a/main/Makefile +++ b/main/Makefile @@ -56,7 +56,7 @@ endif ifneq ($(findstring darwin,$(OSARCH)),) AST_LIBS+=-lresolv - ASTLINK=-Xlinker -macosx_version_min -Xlinker 10.6 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace + ASTLINK=-mmacosx-version-min=10.6 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace ASTLINK+=/usr/lib/bundle1.o else # These are used for all but Darwin