diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-11 15:50:21 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-11 15:50:21 +0200 |
commit | baba3cbb0af2df51921abe4f329af4ab133654b2 (patch) | |
tree | 015370946d86e0b66829dfe7d17f2d9621a2c208 /pkgs | |
parent | afebababacee7b75f7a13e3438d8583936569ba9 (diff) | |
download | nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.tar nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.tar.gz nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.tar.bz2 nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.tar.lz nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.tar.xz nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.tar.zst nixpkgs-baba3cbb0af2df51921abe4f329af4ab133654b2.zip |
Remove tabs
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/glibc/2.17/builder.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/libraries/glibc/2.17/builder.sh b/pkgs/development/libraries/glibc/2.17/builder.sh index e68e13f9bec..b01977a33de 100644 --- a/pkgs/development/libraries/glibc/2.17/builder.sh +++ b/pkgs/development/libraries/glibc/2.17/builder.sh @@ -19,7 +19,7 @@ postInstall() { if test -n "$installLocales"; then make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales fi - + test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been @@ -27,19 +27,19 @@ postInstall() { if test -z "$hurdHeaders"; then # Include the Linux kernel headers in Glibc, except the `scsi' # subdirectory, which Glibc provides itself. - (cd $out/include && \ - ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) + (cd $out/include && \ + ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .) fi if test -f "$out/lib/libhurduser.so"; then - # libc.so, libhurduser.so, and libmachuser.so depend on each - # other, so add them to libc.so (a RUNPATH on libc.so.0.3 - # would be ignored by the cross-linker.) - echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." - sed -i "$out/lib/libc.so" \ - -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" + # libc.so, libhurduser.so, and libmachuser.so depend on each + # other, so add them to libc.so (a RUNPATH on libc.so.0.3 + # would be ignored by the cross-linker.) + echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..." + sed -i "$out/lib/libc.so" \ + -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g" fi - + # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink # "lib64" to "lib". if test -n "$is64bit"; then |