[uClibc-cvs] svn commit: trunk/uClibc: extra/Configs

[jocke at uclibc.org]

Author: jocke
Date: 2005-08-12 17:19:44 -0600 (Fri, 12 Aug 2005)
New Revision: 11125

Log:
Remove SYSTEM_LDSO option since it no longer works.


Modified:
   trunk/uClibc/Rules.mak
   trunk/uClibc/extra/Configs/Config.in


Changeset:
Modified: trunk/uClibc/Rules.mak
===================================================================
--- trunk/uClibc/Rules.mak	2005-08-12 23:10:22 UTC (rev 11124)
+++ trunk/uClibc/Rules.mak	2005-08-12 23:19:44 UTC (rev 11125)
@@ -318,10 +318,7 @@
     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)

Modified: trunk/uClibc/extra/Configs/Config.in
===================================================================
--- trunk/uClibc/extra/Configs/Config.in	2005-08-12 23:10:22 UTC (rev 11124)
+++ trunk/uClibc/extra/Configs/Config.in	2005-08-12 23:19:44 UTC (rev 11125)
@@ -1080,20 +1080,6 @@
 	  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/"