From a813457d190b863e1de3d9cb48c4f2b8f1cd46b3 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:57:11 -0700 Subject: [PATCH] gerbil: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/development/compilers/gerbil/build.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 040f17ff2850..3d2fd7551e67 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -21,15 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ gambit ] ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; - # disable stackprotector on aarch64-darwin for now - # build error: - # ``` - # /private/tmp/nix-build-gerbil-unstable-2020-11-05.drv-0/ccjyhWKi.s:326:15: error: index must be an integer in range [-256, 255]. - # ldr x2, [x2, ___stack_chk_guard];momd - # ^ - # ``` - hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ]; - NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = ''