From 8d5946b7274b280ccecf576df86ac918392a4969 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Fri, 12 Aug 2005 23:19:44 +0000 Subject: Remove SYSTEM_LDSO option since it no longer works. --- Rules.mak | 5 +---- extra/Configs/Config.in | 14 -------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Rules.mak b/Rules.mak index 600fba877..81de43dd0 100644 --- a/Rules.mak +++ b/Rules.mak @@ -318,10 +318,7 @@ ifeq ($(HAVE_SHARED),y) ifeq ($(BUILD_UCLIBC_LDSO),y) LDSO:=$(TOPDIR)lib/$(UCLIBC_LDSO) DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO) - else - LDSO:=$(SYSTEM_LDSO) - DYNAMIC_LINKER:=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO)))) - endif + endif endif CFLAGS_NOPIC:=$(CFLAGS) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 4cb4216bb..ac5a3e104 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1080,20 +1080,6 @@ config SHARED_LIB_LOADER_PREFIX sitting in the directory this points to, your binaries will not run. -config SYSTEM_LDSO - string "System shared library loader" - depends on HAVE_SHARED && !BUILD_UCLIBC_LDSO - default "/lib/ld-linux.so.2" - help - If you are using shared libraries, but do not want/have a native - uClibc shared library loader, please specify the name of your - target system's shared library loader here... - - BIG FAT WARNING: - If you do not have a shared library loader with the correct name - sitting in the directory this points to, your binaries will not - run. - config RUNTIME_PREFIX string "uClibc runtime library directory" default "/usr/$(TARGET_ARCH)-linux-uclibc/" -- cgit v1.2.3