mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
Making, in cross-builds, every buildInput a propagatedBuildInput. We need
this because 'ld' wants to know the path of every library involved in a dynamic linking. I imagine that ld does not need that in native builds because it can call the loader for it to resolve the library rpaths, but this is not the case for cross-building. svn path=/nixpkgs/branches/stdenv-updates/; revision=18577
This commit is contained in:
parent
d8aa5b5db1
commit
eadcd4462d
@ -147,8 +147,14 @@ rec {
|
||||
++ nativeInputsFromBuildInputs
|
||||
++ [ gccCross binutilsCross ] ++
|
||||
stdenv.lib.optional selfBuildNativeInput buildDrv;
|
||||
buildInputs = buildInputsDrvs;
|
||||
propagatedBuildInputs = propagatedBuildInputsDrvs;
|
||||
|
||||
# Cross-linking dynamic libraries, every buildInput should
|
||||
# be propagated because ld needs the -rpath-link to find
|
||||
# any library needed to link the program dynamically at
|
||||
# loader time. ld(1) explains it.
|
||||
buildInputs = [];
|
||||
propagatedBuildInputs = propagatedBuildInputsDrvs +
|
||||
buildInputsDrvs;
|
||||
propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs;
|
||||
|
||||
crossConfig = cross.config;
|
||||
|
Loading…
Reference in New Issue
Block a user