diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 16:30:26 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-17 16:30:26 +0100 |
| commit | 7d19d7ee18dd5834c14509e65f91735246701f20 (patch) | |
| tree | d380c48ebff863c4afb3e480ed310500338ca73a /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | e96741cdb153fda08dee5a10ab636a947bbcaf78 (diff) | |
| download | nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.tar nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.tar.gz nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.tar.bz2 nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.tar.lz nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.tar.xz nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.tar.zst nixpkgs-7d19d7ee18dd5834c14509e65f91735246701f20.zip | |
Revert "linux-*: build with gcc7, but allow overriding it"
This reverts commit ae040525d8aa01e81ffd1d1c97c908a6e63c819f. gcc7 is the default now.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -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 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 |