Fixed some details on cross compilation. Among others:
- Stating better the guile dependencies (native/host) for guile to build - Fixing cross-linking, through --rpath-link (ld(1) explains well about it - Made gcc call the linker and the assembler through the gcc wrapper instead of directly. I thought this was the source of missing -rpath's, but the source of the problem ended up being the lack of --rpath-link. But I think the native gcc calls the wrapped ld and as, so let's do the same cross compiling. - Removed the binutilsCross from the glibc expressions. Now they are built using the gcc-cross-wrapper, and they were built with the direct gcc and binutils before this change. - I think patchelf and strip don't break the cross-compiled binaries, so I reallow them on cross compilation. - I disable the checkPhase on cross compilation. This made gmp and libtool fail when cross compiled, iirc. svn path=/nixpkgs/branches/stdenv-updates/; revision=18498
This commit is contained in:
@@ -9,13 +9,15 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildNativeInputs = [ makeWrapper ];
|
||||
propagatedBuildInputs = [ libtool ];
|
||||
propagatedBuildNativeInputs = [readline gmp gawk];
|
||||
propagatedBuildInputs = [ libtool gmp ];
|
||||
propagatedBuildNativeInputs = [readline gawk];
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
|
||||
'';
|
||||
|
||||
NIX_DEBUG=1;
|
||||
|
||||
preBuild = ''
|
||||
sed -e '/lt_dlinit/a lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user