From 9381d622e2411a35a5fd73a5a573eb269e2dd9c9 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 1 Jul 2010 10:28:46 +0200 Subject: nptl: fix buildsys Now automatically picks the correct (arch and subarch specific) impls in favour of generic impls. make O=/tmp/objs PREFIX=/my/sysroot -j works now as expected (both out-of-tree as well as parallel-safe). Signed-off-by: Bernhard Reutner-Fischer --- Rules.mak | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index f6c4b4ad4..2fc2b8bec 100644 --- a/Rules.mak +++ b/Rules.mak @@ -130,8 +130,12 @@ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a libc := $(top_builddir)lib/$(SHARED_LIBNAME) libc.depend := $(top_builddir)lib/$(SHARED_LIBNAME:.$(ABI_VERSION)=) +ifneq ($(ARCH_HAS_NO_SHARED),y) libdl.depend := $(top_builddir)lib/libdl.so +endif +ifneq ($(HAS_NO_THREADS),y) libpthread.depend := $(top_builddir)lib/libpthread.so +endif interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) headers_dep := $(top_builddir)include/bits/sysnum.h @@ -638,7 +642,7 @@ PTDIR := libpthread/$(PTNAME) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) PTINC:= -I$(top_builddir)$(PTDIR) \ -I$(top_srcdir)$(PTDIR) \ - -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/$(TARGET_SUBARCH) \ + $(if $(TARGET_ARCH),-I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/$(TARGET_SUBARCH)) \ -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ -I$(top_builddir)$(PTDIR)/sysdeps/$(TARGET_ARCH) \ -I$(top_srcdir)$(PTDIR)/sysdeps/$(TARGET_ARCH) \ -- cgit v1.2.3