Merge pull request #147505 from NixOS/backport-147422-to-release-21.11

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

[Backport release-21.11] ocaml: heed hardeningDisable flags set for individual versions, fixing many coq versions on darwin

authored by

Domen Kožar and committed by

GitHub 4 years ago 91c12917 6e98787d

+2 -1

1 changed file

expand all

unified split

pkgs

development

compilers

ocaml

generic.nix

+2 -1

pkgs/development/compilers/ocaml/generic.nix

··· 66 66 dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; 67 67 configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; 68 68 # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together 69 - hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; 69 + hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie" 70 + ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable; 70 71 71 72 buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; 72 73 buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses