From fe2f7eae17ee83b1e4535845ca2add65a624118f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sat, 21 Aug 2010 18:23:55 +0000 Subject: [PATCH] Making the stage1 work on mips too (for the name of the dynamic loader) svn path=/nixos/trunk/; revision=23325 --- modules/system/boot/stage-1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix index 4eb0eedf0b4..9a324124a9d 100644 --- a/modules/system/boot/stage-1.nix +++ b/modules/system/boot/stage-1.nix @@ -109,7 +109,7 @@ let ensureDir $out/lib # Copy what we need from Glibc. - cp -pv ${pkgs.glibc}/lib/ld-linux*.so.? $out/lib + cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib cp -pv ${pkgs.glibc}/lib/libc.so.* $out/lib cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib @@ -176,9 +176,9 @@ let for i in $out/bin/*; do if ! test -L $i; then echo "patching $i..." - patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true + patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true if [ -n "$doublePatchelf" ]; then - patchelf --set-interpreter $out/lib/ld-linux*.so.? --set-rpath $out/lib $i || true + patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true fi fi done