Merge commit '198dceccbe5414a5fd72ca83624c0cc715db1aad' into gcc-simplify-flags

2017-12-05 16:55:11 -05:00
parent c8d435476d 198dceccbe
commit c9ca541994
62 changed files with 560 additions and 929 deletions
@@ -406,7 +406,7 @@ stdenv.mkDerivation ({
    CC_FOR_TARGET = "${targetPlatform.config}-gcc";
    CXX_FOR_TARGET = "${targetPlatform.config}-g++";
    # If we are making a cross compiler, cross != null
-    NIX_CC_CROSS = if targetPlatform == hostPlatform then "${stdenv.ccCross}" else "";
+    NIX_CC_CROSS = optionalString (targetPlatform == hostPlatform) builtins.toString stdenv.cc;
    dontStrip = true;
    buildFlags = "";
  };