[svn-commits] kpfleming: branch kpfleming/new_optional_api r197860 - in /team/kpfleming/new...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Thu May 28 17:42:15 2009
New Revision: 197860

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197860
Log:
two Darwin related changes:

* remove -dynamic linker option, as it is the default

* add "-undefined suppress" and "-force_flat_namespace" to main Asterisk binary build to allow it to use weak_import symbols and match the dynamic libraries it uses


Modified:
    team/kpfleming/new_optional_api/Makefile
    team/kpfleming/new_optional_api/main/Makefile

Modified: team/kpfleming/new_optional_api/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/new_optional_api/Makefile?view=diff&rev=197860&r1=197859&r2=197860
==============================================================================
--- team/kpfleming/new_optional_api/Makefile (original)
+++ team/kpfleming/new_optional_api/Makefile Thu May 28 17:42:15 2009
@@ -307,7 +307,7 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
-  SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
+  SOLINK=-bundle -undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
   SOLINK=-shared

Modified: team/kpfleming/new_optional_api/main/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/kpfleming/new_optional_api/main/Makefile?view=diff&rev=197860&r1=197859&r2=197860
==============================================================================
--- team/kpfleming/new_optional_api/main/Makefile (original)
+++ team/kpfleming/new_optional_api/main/Makefile Thu May 28 17:42:15 2009
@@ -58,9 +58,7 @@
 
 ifneq ($(findstring darwin,$(OSARCH)),)
   AST_LIBS+=-lresolv
-  ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
-    ASTLINK=-Wl,-dynamic
-  endif
+  ASTLINK=-undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
   ifneq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)