From 791531028f3aa80c6eb219ed4c50c7d61868b1c9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 25 Nov 2021 21:13:12 +0000 Subject: [PATCH] ocaml: heed hardeningDisable flags set for individual versions specifically this re-fixes ocaml 4.09 on clang by allowing its hardeningDisable flags to take effect (cherry picked from commit dc523cbb801fc4fd3143750e3e34b1ea040715ae) --- pkgs/development/compilers/ocaml/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 1b6a3b56e622..c474a2e85f15 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -66,7 +66,8 @@ stdenv.mkDerivation (args // { dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together - hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; + hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" + ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses