diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 10:34:14 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-14 10:34:14 +0000 |
commit | b5c1babce0bf6638ed45574273ebb9d7311a8282 (patch) | |
tree | bdec5fe1fb4cb03c540a422b90491b07b4cca50e | |
parent | 2acee0941b22670c0017e709af6bc4ecaa5ddcd0 (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.0@148739 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -292,7 +292,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 |