Merge pull request #189763 from tjni/gerbil-stackprotector

2022-09-17 14:18:01 +02:00
parent ba3f865619 a813457d19
commit dec9066253
1 changed files with 0 additions and 9 deletions
@@ -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 = ''