From 01c125c3bd8f949f8e5711e09152859eecd1b004 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Thu, 7 Jun 2012 11:32:24 -0700 Subject: buildsys: clean up libubacktrace linker script handling Currently, the installed libubacktrace linker script entry always uses HARDWIRED_ABSPATH semantics, even if HARDWIRED_ABSPATH is disabled: $ grep GROUP $PREFIX/mipsel-linux-uclibc/sys-root/usr/lib/libc.so GROUP ( libc.so.0 uclibc_nonshared.a AS_NEEDED ( ld-uClibc.so.0 ) ) GROUP ( AS_NEEDED ( /lib/libubacktrace.so.0 ) ) This causes problems when building a non-sysroot toolchain. Move the AS_NEEDED insertion into libc/Makefile.in, and add a case to the HARDWIRED_ABSPATH substitution command so libubacktrace is handled the same way as the other libraries listed in the script. Signed-off-by: Kevin Cernekee Signed-off-by: Bernhard Reutner-Fischer --- libc/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'libc/Makefile.in') diff --git a/libc/Makefile.in b/libc/Makefile.in index 3b6a17b32..d8ea7bd99 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -74,6 +74,7 @@ ifeq ($(COMPAT_ATEXIT),y) else $(Q)echo "GROUP ( $(SHARED_LIBNAME) $(NONSHARED_LIBNAME) $(ASNEEDED) )" >> $@.tmp endif + $(Q)echo "$(UBACKTRACE_ASNEEDED)" >> $@.tmp $(Q)mv $@.tmp $@ $(libc_OUT)/libc_so.a: $(libc-so-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME) -- cgit v1.2.3