public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reorganize crossDrv hooks

Browse Source
This commit is contained in:
Eric Litak
2016-05-31 16:27:24 -07:00
parent 0265285b96
commit 44ae9a3c0a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glibc/default.nix
+5 -1
View File
@@ -40,7 +40,7 @@ in
# Building from a proper gcc staying in the path where it was installed, # 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 # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without
# any special hack. # any special hack.
preInstall = if cross != null then "" else '' preInstall = ''
if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
mkdir -p $out/lib mkdir -p $out/lib
cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
@@ -114,6 +114,10 @@ in
dontStrip=1 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'. # To avoid a dependency on the build system 'bash'.
preFixup = '' preFixup = ''
rm $bin/bin/{ldd,tzselect,catchsegv,xtrace} rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}