diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:32:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:32:46 +0100 |
| commit | 3e6c5a25f38697c088a1ab38a12ab81f21f3849e (patch) | |
| tree | f46b38a83da6904c0daa4d4f9de66b6dd1f629c8 /pkgs/os-specific/linux/kernel | |
| parent | 09cc8872ef8b362187ffdef1eaabf71c7f7265ab (diff) | |
| parent | 4f79874f5708b16dbf03b80af5f47fd61c9d116d (diff) | |
| download | nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.gz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.bz2 nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.lz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.xz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.zst nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.zip | |
Merge branch 'staging'
In particular, this upgrades the default gcc: 6 -> 7. Fixes #27794, /cc #31747.
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8aa813cb195a..f69865cdc4df 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 buildPackages.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 |