gcc: Fix deps, for cross and consistency

Mainly making sure we have tools to build target libs
2017-12-30 22:04:22 -05:00
parent 114a9b6253
commit 9cda2f5559
6 changed files with 72 additions and 24 deletions
@@ -267,8 +267,18 @@ stdenv.mkDerivation ({
    ++ (optional (perl != null) perl)
    ++ (optional javaAwtGtk pkgconfig);

-  buildInputs = [ gmp mpfr libmpc libelf ]
-    ++ (optional (cloog != null) cloog)
+  # For building runtime libs
+  depsBuildTarget =
+    if hostPlatform == buildPlatform then [
+      targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+    ] else assert targetPlatform == hostPlatform; [ # build != host == target
+      stdenv.cc
+    ];
+
+  buildInputs = [
+    gmp mpfr libmpc libelf
+    targetPackages.stdenv.cc.bintools # For linking code at run-time
+  ] ++ (optional (cloog != null) cloog)
    ++ (optional (isl != null) isl)
    ++ (optional (zlib != null) zlib)
    ++ (optionals langJava [ boehmgc zip unzip ])