From f0da4aa1d854ca9c2a0e652dcb1d81bbf4d971f4 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Sat, 12 May 2001 06:19:18 +0000 Subject: Ok, this should finish off my massive ro-organization. The source tree is less messy now (which helps), all libraries are placed into uClibc/lib when compiling, all libraries now use a consistant mechanism for being built, all libraries use a consistant naming scheme where the lib name includes the uClibc version number, which makes ldconfig happy and willing to work with us. -Erik --- Rules.mak | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Rules.mak') diff --git a/Rules.mak b/Rules.mak index 9fa518bfe..1b065a1a5 100644 --- a/Rules.mak +++ b/Rules.mak @@ -31,6 +31,7 @@ LIBNAME=libc.a SHARED_FULLNAME=libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so SHARED_MAJORNAME=libc.so.$(MAJOR_VERSION) UCLIBC_LDSO=ld-uclibc.so.$(MAJOR_VERSION) +LIBC=$(TOPDIR)libc/libc.a BUILDTIME = $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z") @@ -63,7 +64,11 @@ endif NATIVE_ARCH = $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' -e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/ppc/powerpc/g') -LDSO_PRESENT=$(strip $(shell cd $(TOPDIR)/ld.so-1/d-link; ls -d $(TARGET_ARCH) 2>/dev/null)) +ifeq ($(strip $(HAS_MMU)),true) + DO_SHARED=shared +endif + +LDSO_PRESENT=$(strip $(shell cd $(TOPDIR)/ldso/d-link; ls -d $(TARGET_ARCH) 2>/dev/null)) ifeq ($(NATIVE_ARCH), $(TARGET_ARCH)) SYSTEM_LDSO=$(shell ldd `which $(CC)` | sed -ne /ld/p | sed -e s/\ =.*//g) @@ -72,11 +77,10 @@ else endif ifeq ($(LDSO_PRESENT), $(TARGET_ARCH)) - LDSO=ld.so-1/d-link/$(UCLIBC_LDSO) + LDSO=$(TOPDIR)lib/$(UCLIBC_LDSO) else LDSO=$(SYSTEM_LDSO) endif - # It turns out the currently, function-sections causes ldelf2flt to segfault. -- cgit v1.2.3