diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 16:32:58 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2012-06-15 16:32:58 +0200 |
| commit | 1716aab0d419aaa6c7639b51d314d3d9b573bebd (patch) | |
| tree | 35e3f1c1432705982d624149eb259c5f88927a78 | |
| parent | 551e6d6ac559016e99928afe2fd3c93c3d0d0fb6 (diff) | |
libubacktrace: temporarily workaround link issue
temporarily work around circular dependency in linking that was
introduced by 01c125c3bd8f949f8e5711e09152859eecd1b004
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | Rules.mak | 5 | ||||
| -rw-r--r-- | libc/Makefile.in | 2 |
2 files changed, 5 insertions, 2 deletions
@@ -117,7 +117,7 @@ export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL LIBC := libc SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) -UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) +UBACKTRACE_DSO := libubacktrace.a #so.$(ABI_VERSION) ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) UCLIBC_LDSO_NAME := ld64-uClibc ARCH_NATIVE_BIT := 64 @@ -135,6 +135,9 @@ endif ifneq ($(HAS_NO_THREADS),y) libpthread.depend := $(top_builddir)lib/libpthread.so endif +ifeq ($(UCLIBC_HAS_BACKTRACE),y) +libubacktrace.depend := $(top_builddir)lib/libubacktrace.a +endif interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) headers_dep := $(top_builddir)include/bits/sysnum.h diff --git a/libc/Makefile.in b/libc/Makefile.in index d8ea7bd99..4f919acac 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -20,7 +20,7 @@ LDFLAGS-libc.so := $(LDFLAGS) $(VERSION_SCRIPT) -Wl,-init,$(SYMBOL_PREFIX)__uCli ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS += -D__USE_STDIO_FUTEXES__ endif -LIBS-libc.so := $(interp) $(ldso) $(top_builddir)lib/$(NONSHARED_LIBNAME) +LIBS-libc.so := $(interp) $(ldso) $(top_builddir)lib/$(NONSHARED_LIBNAME) $(libubacktrace.depend) # we have SHARED_LIBNAME=libc.so.$(ABI_VERSION) defined in Rules.mak libc_FULL_NAME := libuClibc-$(VERSION).so |