[asterisk-commits] kpfleming: branch 1.6.1 r148740 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Oct 14 05:35:27 2008
New Revision: 148740

URL: http://svn.digium.com/view/asterisk?view=rev&rev=148740
Log:
Merged revisions 148738 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r148738 | kpfleming | 2008-10-14 12:33:14 +0200 (Tue, 14 Oct 2008) | 9 lines
  
  Merged revisions 148736 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r148736 | kpfleming | 2008-10-14 12:30:54 +0200 (Tue, 14 Oct 2008) | 3 lines
    
    on Ubuntu (at least), recent versions of ld in binutils delete all debugging symbols when -x is supplied; since the reasons why -x is being passed are lost in the mists of time, remove it so debugging will work properly
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/Makefile

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/Makefile?view=diff&rev=148740&r1=148739&r2=148740
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Tue Oct 14 05:35:27 2008
@@ -300,7 +300,7 @@
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 else
 # These are used for all but Darwin
-  SOLINK=-shared -Xlinker -x
+  SOLINK=-shared
   ifneq ($(findstring BSD,$(OSARCH)),)
     LDFLAGS+=-L/usr/local/lib
   endif