Merge pull request #188352 from tjni/sundials-stackprotector

sundials: reenable stackprotector on aarch64-darwin
This commit is contained in:
Sandro 2022-09-04 10:58:59 +02:00 committed by GitHub
commit b727af8064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -61,21 +61,6 @@ stdenv.mkDerivation rec {
)]
;
# disable stackprotector on aarch64-darwin for now
# https://github.com/NixOS/nixpkgs/issues/127608
#
# build error:
#
# /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255].
# ldr x0, [x0, ___stack_chk_guard];momd
# ^
# /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255].
# ldr x0, [x0, ___stack_chk_guard];momd
#
# See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
doCheck = true;
checkTarget = "test";