Merge pull request #188352 from tjni/sundials-stackprotector
sundials: reenable stackprotector on aarch64-darwin
This commit is contained in:
commit
b727af8064
@ -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";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user