diff options
| author | Eric Litak <elitak@gmail.com> | 2016-05-29 09:00:22 -0700 |
|---|---|---|
| committer | Eric Litak <elitak@gmail.com> | 2016-05-31 16:27:24 -0700 |
| commit | 44ae9a3c0a92b68c3e4b8425784ddc8a777c866d (patch) | |
| tree | b5f757b90dce245229d589a8a61c0d209da0b969 | |
| parent | 0265285b9636c5d900aded5d17073d8538ae60ba (diff) | |
| download | nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.tar nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.tar.gz nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.tar.bz2 nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.tar.lz nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.tar.xz nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.tar.zst nixlib-44ae9a3c0a92b68c3e4b8425784ddc8a777c866d.zip | |
reorganize crossDrv hooks
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1124ff18499b..383b2f5cc464 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -40,7 +40,7 @@ in # Building from a proper gcc staying in the path where it was installed, # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. - preInstall = if cross != null then "" else '' + preInstall = '' if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 @@ -114,6 +114,10 @@ in dontStrip=1 ''; + preInstall = null; # clobber the native hook + + separateDebugInfo = false; # this is currently broken for crossDrv + # To avoid a dependency on the build system 'bash'. preFixup = '' rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} |