Skip to content
Snippets Groups Projects
Commit 5819278c authored by Mark Michelson's avatar Mark Michelson
Browse files

Revert Makefile change to remove embedding res_adsi.so

The change has resulted in a linking error for certain versions
of GCC. This is much worse than the original issue, so for now,
temporarily revert the change. A more thorough change will be
sought out.
........

Merged revisions 368927 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 368928 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368929 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent cfa0826c
Branches
Tags
No related merge requests found
...@@ -29,6 +29,9 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o)) ...@@ -29,6 +29,9 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o))
# otherwise modules will not have them available if none of the static # otherwise modules will not have them available if none of the static
# 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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment