From 57a38b02f96d6e72040b5c54e745e528622eec22 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 14 Jul 2024 13:20:00 +0100 Subject: [PATCH] llvm: make hardeningDisable of trivialautovarinit common across all llvms its omission from llvm 17 was probably an oversight arising from llvm 17's release leap-frogging the trivialautovarinit PR --- pkgs/development/compilers/llvm/common/llvm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index f780c87d0e4b..a59c704ebbcb 100644 --- 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" ]; })