diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-06-14 15:28:02 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-06-14 15:28:02 +0000 |
| commit | 5819278c46ec80e51901718e4a8a34d6a9429b1b (patch) | |
| tree | 0e5f64b68228146223acde12c6ed9332fcfc0576 /main | |
| parent | cfa0826c492951b2c57f1350a7ed1bc3a97d6f9b (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile index 4d446f08c..3429723b6 100644 --- a/main/Makefile +++ b/main/Makefile @@ -29,6 +29,9 @@ OBJS=$(filter-out $(OBJSFILTER),$(SRC:.c=.o)) # otherwise modules will not have them available if none of the static # 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) |