From 7d19d7ee18dd5834c14509e65f91735246701f20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 17 Feb 2018 16:30:26 +0100
Subject: [PATCH] Revert "linux-*: build with gcc7, but allow overriding it"

This reverts commit ae040525d8aa01e81ffd1d1c97c908a6e63c819f.
gcc7 is the default now.
---
 pkgs/os-specific/linux/kernel/generic.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 216a7c7cb85..f69865cdc4d 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -4,15 +4,10 @@
 , utillinux
 , writeTextFile, ubootTools
 , callPackage
-, overrideCC, gcc7
 }:
 
 { stdenv, buildPackages, perl, buildLinux
 
-, # Allow really overriding even our gcc7 default.
-  # We want gcc >= 7.3 to enable the "retpoline" mitigation of security problems.
-  stdenvNoOverride ? overrideCC stdenv gcc7
-
 , # The kernel source tarball.
   src
 
@@ -37,14 +32,12 @@
   # optionally be compressed with gzip or bzip2.
   kernelPatches ? []
 , ignoreConfigErrors ? hostPlatform.platform.name != "pc" ||
-                       hostPlatform != stdenvNoOverride.buildPlatform
+                       hostPlatform != stdenv.buildPlatform
 , extraMeta ? {}
 , hostPlatform
 , ...
 } @ args:
 
-let stdenv = stdenvNoOverride; in # finish the rename
-
 assert stdenv.isLinux;
 
 let