diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-09-19 20:31:09 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2011-09-19 20:31:09 +0000 |
| commit | 5e7121b44f9b9c305784b1601b04272f43eab28b (patch) | |
| tree | ff27a7c9570ce8c9aaeec9bd23a236741c6a4d13 /main | |
| parent | 364eb5683575df3a72302f5494a36fd55690e1c9 (diff) | |
Merged revisions 336734 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r336734 | tilghman | 2011-09-19 15:29:40 -0500 (Mon, 19 Sep 2011) | 18 lines
Merged revisions 336733 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r336733 | tilghman | 2011-09-19 15:27:03 -0500 (Mon, 19 Sep 2011) | 11 lines
Various changes to allow 1.8 to compile on Mac OS X Lion (10.7)
* Makefile workaround for 10.6 extended to work on 10.7 and later.
* Now uses the 'weak' symbol for Lion systems, which no longer support
'weak_import'
Closes ASTERISK-17612.
Closes ASTERISK-18213.
Tested by: tilghman, oej.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index d7315c3c2..728b80591 100644 --- a/main/Makefile +++ b/main/Makefile @@ -54,7 +54,7 @@ endif ifneq ($(findstring darwin,$(OSARCH)),) AST_LIBS+=-lresolv ASTLINK=-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) + ifeq ($(shell if test `/usr/bin/sw_vers -productVersion | cut -c4` -gt 5; then echo 6; else echo 0; fi),6) ASTLINK+=/usr/lib/bundle1.o endif else |