Merge pull request #26805 from obsidiansystems/cross-elegant

Make cross compilation elegant
2017-12-30 22:58:02 -05:00
parent 553fd19e67 a98e68676d
commit 4d2b763817
88 changed files with 1059 additions and 699 deletions
@@ -68,10 +68,10 @@ stdenv.mkDerivation rec {
  ];

  # Note: Bison is needed because the patches above modify parse.y.
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
  nativeBuildInputs = [bison]
    ++ optional (texinfo != null) texinfo
-    ++ optional hostPlatform.isDarwin binutils
-    ++ optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+    ++ optional hostPlatform.isDarwin binutils;

  buildInputs = optional interactive readline70;