Ok, this commit is _huge_ and its gonna change the world. I've

been working on a new config system on and off for about 6 months
now, but I've never been fully satisfied.  Well, I'm finally am
happy with the new config system, so here it is.  This completely
removes the old uClibc configuration system, and replaces it with
an entirely new system based on LinuxKernelConf, from
    http://www.xs4all.nl/~zippel/lc/
As it turns out, Linus has just merged LinuxKernelConf into Linux
2.5.45, so it looks like I made the right choice.

I have thus far updated only x86.  I'll be updating the other
architectures shortly.
         -Erik

2 files changed, 2 insertions, 4 deletions

diff --git a/ldso/Makefile b/ldso/Makefile
index c1c907101..d0a133bf7 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -27,14 +27,14 @@ ALL_SUBDIRS = ldso libdl util
 
 
 all:
-ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
+ifeq ($(strip $(BUILD_UCLIBC_LDSO)),y)
 	$(MAKE) -C ldso;
 else
 	echo "Not building ld-uClibc"
 endif
 
 shared: utils
-ifeq ($(strip $(BUILD_UCLIBC_LDSO)),true)
+ifeq ($(strip $(BUILD_UCLIBC_LDSO)),y)
 	$(MAKE) -C libdl;
 else
 	echo "Not building libdl"
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index 262ec5073..3ecbe9f77 100644
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -23,10 +23,8 @@
 
 
 TOPDIR=../../
-DOPIC=true
 include $(TOPDIR)Rules.mak
 LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-LIBGCC:=$(shell $(CC) -print-libgcc-file-name)
 
 # Enable this to enable all the code needed to support traditional ldd
 # (i.e. where the shared library loader does all the heavy lifting)