From 6c67ceaeed2f28b2caa4a5638304d260c8091c42 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Mon, 18 Jun 2012 20:52:28 +0200 Subject: Revert: buildsys: clean up libubacktrace linker script handling Signed-off-by: Kevin Cernekee Signed-off-by: Bernhard Reutner-Fischer --- Rules.mak | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index 0c966d1a9..b92b6ef0c 100644 --- a/Rules.mak +++ b/Rules.mak @@ -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.a #so.$(ABI_VERSION) +UBACKTRACE_DSO := libubacktrace.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,9 +135,6 @@ 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 @@ -581,9 +578,14 @@ export ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && ec # Only used in installed libc.so linker script ifeq ($(UCLIBC_HAS_BACKTRACE),y) +ifeq ($(HARDWIRED_ABSPATH),y) +UBACKTRACE_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UBACKTRACE_DSO)) +else +UBACKTRACE_FULL_NAME := $(UBACKTRACE_DSO) +endif export UBACKTRACE_ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && \ - echo "GROUP ( AS_NEEDED ( $(UBACKTRACE_DSO) ) )" || \ - echo "GROUP ( $(UBACKTRACE_DSO) )") + echo "GROUP ( AS_NEEDED ( $(UBACKTRACE_FULL_NAME) ) )" || \ + echo "GROUP ( $(UBACKTRACE_FULL_NAME) )") else export UBACKTRACE_ASNEEDED:="" endif -- cgit v1.2.3