mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 20:04:50 +00:00
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
This commit is contained in:
@@ -30,10 +30,6 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o))
|
|||||||
# objects use it.
|
# objects use it.
|
||||||
OBJS+=stdtime/localtime.o
|
OBJS+=stdtime/localtime.o
|
||||||
|
|
||||||
ifneq ($(firstword $(subst :, ,$(WEAKREF))),1)
|
|
||||||
OBJS+=../res/res_adsi.o
|
|
||||||
endif
|
|
||||||
|
|
||||||
ASTSSL_LIBS:=$(OPENSSL_LIB)
|
ASTSSL_LIBS:=$(OPENSSL_LIB)
|
||||||
AST_LIBS+=$(BKTR_LIB)
|
AST_LIBS+=$(BKTR_LIB)
|
||||||
AST_LIBS+=$(LIBXML2_LIB)
|
AST_LIBS+=$(LIBXML2_LIB)
|
||||||
|
Reference in New Issue
Block a user