diff options
author | Mark Michelson <mmichelson@digium.com> | 2012-06-13 19:51:08 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2012-06-13 19:51:08 +0000 |
commit | b445e8a7c89bf7e755a3a81d06722842469be687 (patch) | |
tree | 55b3e161a59eab2ca964b4ad94d67f9ff3db45fc | |
parent | a8e895c1a0312c5c6f08bd246ff40a835497f99b (diff) |
Remove forced linking of res_adsi.o
In GCC 4.5+ the result is that Asterisk has a phantom
module loaded at startup, claiming to be res_adsi.
(closes issue ASTERISK-19920)
reported by Leif Madsen
........
Merged revisions 368873 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 368885 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/Makefile b/main/Makefile index 0662f22f3..4d446f08c 100644 --- a/main/Makefile +++ b/main/Makefile @@ -30,10 +30,6 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o)) # objects use it. OBJS+=stdtime/localtime.o -ifneq ($(firstword $(subst :, ,$(WEAKREF))),1) -OBJS+=../res/res_adsi.o -endif - ASTSSL_LIBS:=$(OPENSSL_LIB) AST_LIBS+=$(BKTR_LIB) AST_LIBS+=$(LIBXML2_LIB) |