diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-22 16:17:15 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 17:32:28 -0500 |
commit | 1cde06acf691316a59ad30b207cbd68c64cbc0fa (patch) | |
tree | 3af52f609ae82ec3ffe78133e9bd69a450983070 | |
parent | c15c44923661245b5ca0b5fd74622d5c95beacac (diff) | |
download | nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.tar nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.tar.gz nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.tar.bz2 nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.tar.lz nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.tar.xz nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.tar.zst nixlib-1cde06acf691316a59ad30b207cbd68c64cbc0fa.zip |
stdenv cross adapter: Get rid of extra propagatation of buildInputs
Binutils is patched so we don't rely on `--rpath-link`.
-rw-r--r-- | pkgs/stdenv/adapters.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 1a55b06ef367..f7d2c49a66d6 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -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 {}); }; |