From b70924bd80918d153a5e2023afd7647ae7b24a12 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Sat, 6 May 2017 13:27:15 +0200
Subject: Revert "Merge pull request #25275 from
 Ericson2314/platform-normalize"

This reverts commit 2282a5774cd80567644a44d31585bf965a55f9ec, reversing
changes made to 14adea91566019549f33392d4710d9babd0108d7.

The lib tests are bloking nixpkgs-unstable, and I don't like debugging
it soon enough.
---
 pkgs/top-level/all-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'pkgs/top-level/all-packages.nix')

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 944db15e148a..bbfb92598070 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5048,6 +5048,9 @@ with pkgs;
       cross = targetPlatform;
       crossStageStatic = false;
 
+      # XXX: We have troubles cross-compiling libstdc++ on MinGW (see
+      # <http://hydra.nixos.org/build/4268232>), so don't even try.
+      langCC = targetPlatform.config != "i686-pc-mingw32";
       # Why is this needed?
       inherit (forcedNativePackages) binutils;
     };
-- 
cgit 1.4.1