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

stdenv cross adapter: Get rid of extra propagatation of buildInputs

Browse Source 
Binutils is patched so we don't rely on `--rpath-link`.
This commit is contained in:
John Ericson 2017-12-22 16:17:15 -05:00
parent c15c449236
commit 1cde06acf6
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/stdenv/adapters.nix
View File

@ -74,8 +74,7 @@ rec {
}; };
in stdenv // { in stdenv // {
mkDerivation = mkDerivation =
{ buildInputs ? [], nativeBuildInputs ? [] { nativeBuildInputs ? []
, propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []
, selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false
, ... , ...
} @ args: } @ args:
@ -98,14 +97,6 @@ rec {
++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook ++ stdenv.lib.optional hostPlatform.isAarch64 pkgs.updateAutotoolsGnuConfigScriptsHook
; ;
# 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 = propagatedBuildInputs ++ buildInputs;
propagatedNativeBuildInputs = propagatedNativeBuildInputs;
crossConfig = hostPlatform.config; crossConfig = hostPlatform.config;
} // args.crossAttrs or {}); } // args.crossAttrs or {});
}; };