Merge pull request NixOS#327093 from risicle/ris-llvm-trivialautovari…

…nit-disable-tidy llvm: make `hardeningDisable` of `trivialautovarinit` common across all llvms
tie · Jul 14, 2024 · 8cc8565 · 8cc8565
2 parents 3181754 + 57a38b0
commit 8cc8565
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -102,6 +102,10 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "lib" "dev" "python" ];
 
+  hardeningDisable = [
+    "trivialautovarinit"
+  ];
+
   nativeBuildInputs = [ cmake ]
     ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
     ++ [ python ]
@@ -535,6 +539,4 @@ stdenv.mkDerivation (rec {
     check_version minor ${minor}
     check_version patch ${patch}
   '';
-} // lib.optionalAttrs (lib.versionOlder release_version "17" || lib.versionAtLeast release_version "18") {
-  hardeningDisable = [ "trivialautovarinit" ];
 })