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

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

Browse Source 
I expect we will revert this after general upgrade to gcc7.
See https://github.com/NixOS/nixpkgs/issues/34383
This commit is contained in:
Vladimír Čunát 2018-02-11 18:38:06 +01:00
parent 1f4ac3bc79
commit ae040525d8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 8 additions and 1 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,10 +4,15 @@
, 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
@ -32,12 +37,14 @@
# 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 != stdenv.buildPlatform hostPlatform != stdenvNoOverride.buildPlatform
, extraMeta ? {} , extraMeta ? {}
, hostPlatform , hostPlatform
, ... , ...
} @ args: } @ args:
let stdenv = stdenvNoOverride; in # finish the rename
assert stdenv.isLinux; assert stdenv.isLinux;
let let