diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-07-04 14:13:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-04 14:13:44 -0400 |
| commit | 9385c674106721855d9aef917b2c538cb7f6de6e (patch) | |
| tree | 450c2b8d4fe52e4c47acd04925e2b6f8b1222a0a /pkgs/os-specific | |
| parent | 0ff26ddb481e2b09bc6654a783184331aebd0a76 (diff) | |
| parent | 27934d1c139b6a7a856fd4348eaa0829e970e298 (diff) | |
Merge pull request #324366 from alois31/perf-drop-workaround
Revert "linuxPackages_latest.perf: add `-O1` workaround for `gcc-13`"
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 851a4c8d5d7b6..a54e5c04e214d 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -128,17 +128,12 @@ stdenv.mkDerivation { ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; - env.NIX_CFLAGS_COMPILE = toString ([ + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-Wno-error=stringop-truncation" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "13") [ - # Workaround gcc bug that causes enev simplest `perf top` runs to - # crash: https://gcc.gnu.org/PR111009. - # Can be removed once gcc-13 is updated past 13.2.0. - "-O1" - ]); + ]; doCheck = false; # requires "sparse" |