diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-08 05:18:03 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-08 05:18:03 +0000 |
| commit | b403605f827754cb4e4bdd655b7f2e2405f41696 (patch) | |
| tree | ad296cb4137078281eb24c40b53a208224f9823c /main | |
| parent | 671e1910234775504f7b41556677d434747e8e99 (diff) | |
Merged revisions 251262-251263 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r251262 | tilghman | 2010-03-07 23:12:55 -0600 (Sun, 07 Mar 2010) | 2 lines
Change needed to make Mac OS X 10.6 happy
........
r251263 | tilghman | 2010-03-07 23:15:01 -0600 (Sun, 07 Mar 2010) | 2 lines
Remove portions that weren't meant to be committed for the OS X compat fix
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@251268 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile index 4b0de7eef..24337cf44 100644 --- a/main/Makefile +++ b/main/Makefile @@ -62,6 +62,9 @@ ifneq ($(findstring darwin,$(OSARCH)),) ASTLINK=-Wl,-dynamic endif 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) + ASTLINK+=/usr/lib/bundle1.o + endif else # These are used for all but Darwin ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),) |