Commit 1cde06ac authored by John Ericson's avatar John Ericson
Browse files

stdenv cross adapter: Get rid of extra propagatation of buildInputs 

Binutils is patched so we don't rely on `--rpath-link`.
parent c15c4492

pkgs/stdenv/adapters.nix

+1 −10
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ rec { 
    };

  in stdenv // {

    mkDerivation =

      { buildInputs ? [], nativeBuildInputs ? []

      , propagatedBuildInputs ? [], propagatedNativeBuildInputs ? []

      { nativeBuildInputs ? []

      , selfNativeBuildInput ? args.crossAttrs.selfNativeBuildInput or false

      , ...

      } @ args:
@@ -98,14 +97,6 @@ rec { 
            ++ 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;

        } // args.crossAttrs or {});

  };