diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 18:23:55 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-21 18:23:55 +0000 |
| commit | fe2f7eae17ee83b1e4535845ca2add65a624118f (patch) | |
| tree | 48ef544ef27b1139d33fd4def422c561ecdf3b06 | |
| parent | a7d7f1630fbb248c16ffe5afdcb8f2c8eda67b5c (diff) | |
| download | nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.tar nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.tar.gz nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.tar.bz2 nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.tar.lz nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.tar.xz nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.tar.zst nixpkgs-fe2f7eae17ee83b1e4535845ca2add65a624118f.zip | |
Making the stage1 work on mips too (for the name of the dynamic loader)
svn path=/nixos/trunk/; revision=23325
| -rw-r--r-- | modules/system/boot/stage-1.nix | 6 |
1 files 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 |