aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-14 10:35:27 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-10-14 10:35:27 +0000
commite0c6de027a0adc67b71d7fc820035dbdb21f2563 (patch)
treedc443c823063356aee302fa3956ac6dcaf29f20f /Makefile
parent028c4ab1ce0ed7d2bc13b178c96f3260a8877493 (diff)
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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@148740 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4b31d1690..0faf972dc 100644
--- a/Makefile
+++ b/Makefile
@@ -300,7 +300,7 @@ ifneq ($(findstring darwin,$(OSARCH)),)
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