glibc: Buildfixes.

Configure right linker for tests.
Works for x86_64 as well.

diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm
index 974b0aeead7e606e40b14f74aae9dc5166e24504..6183e0faca736733b05a19e3befb787b07936605 100644 (file)
--- a/pkgs/core/glibc/glibc.nm
+++ b/pkgs/core/glibc/glibc.nm
@@ -162,6 +162,10 @@ define STAGE_PREPARE
 
        cat $(DIR_SOURCE)/$(THISAPP)-stack_chk_fail.c \
                > $(DIR_APP)/debug/stack_chk_fail.c
+
+       cd $(DIR_APP) && \
+               sed -e "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$(shell readelf -l /bin/sh | sed -n 's@.*interpret.*$(TOOLS_DIR)\(.*\)]$$@\1@p') -o|" \
+               -i scripts/test-installation.pl
 endef
 
 define STAGE_BUILD
@@ -175,9 +179,6 @@ define STAGE_BUILD
 
        cd $(DIR_APP) && sed 's/-nostdlib/& -fno-stack-protector/g' -i.orig configure
 
-       cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$(LINKER) -o|' \
-               scripts/test-installation.pl
-
        cd $(DIR_SRC)/glibc-build && \
                CFLAGS= \
                CXXFLAGS= \
@@ -224,8 +225,7 @@ define STAGE_INSTALL
 
        # Locales
        -mkdir -pv $(BUILDROOT)/usr/lib/locale
-       # This would install all locales that are supported, but we do only
-       # install a minimal set of them
+       # This would install all locales that are supported
        cd $(DIR_SRC)/glibc-build && make localedata/install-locales install_root=$(BUILDROOT)
 
        # Timezone