public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "linux-*: build with gcc7, but allow overriding it" 

This reverts commit ae040525d8.
gcc7 is the default now.
This commit is contained in:
Vladimír Čunát 2018-02-17 16:30:26 +01:00
parent e96741cdb1
commit 7d19d7ee18
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -4,15 +4,10 @@
, utillinux , utillinux
, writeTextFile, ubootTools , writeTextFile, ubootTools
, callPackage , callPackage
, overrideCC, gcc7
}: }:
{ stdenv, buildPackages, perl, buildLinux { 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. , # The kernel source tarball.
src src
@ -37,14 +32,12 @@
# optionally be compressed with gzip or bzip2. # optionally be compressed with gzip or bzip2.
kernelPatches ? [] kernelPatches ? []
, ignoreConfigErrors ? hostPlatform.platform.name != "pc" || , ignoreConfigErrors ? hostPlatform.platform.name != "pc" ||
hostPlatform != stdenvNoOverride.buildPlatform hostPlatform != stdenv.buildPlatform
, extraMeta ? {} , extraMeta ? {}
, hostPlatform , hostPlatform
, ... , ...
} @ args: } @ args:
let stdenv = stdenvNoOverride; in # finish the rename
assert stdenv.isLinux; assert stdenv.isLinux;
let let