1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00

Merge pull request #189747 from tjni/gambit-stackprotector

gambit: reenable stackprotector on aarch64-darwin
This commit is contained in:
7c6f434c 2022-09-07 18:19:36 +00:00 committed by GitHub
commit 4b5104adc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 18 deletions

View file

@ -15,15 +15,6 @@ gccStdenv.mkDerivation {
buildInputs = [ autoconf ];
# disable stackprotector on aarch64-darwin for now
# build error:
# ```
# /private/tmp/nix-build-gambit-bootstrap-4.9.3.drv-0/ccbOVwnF.s:207: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" ];
configurePhase = ''
export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \
CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \

View file

@ -35,15 +35,6 @@ gccStdenv.mkDerivation rec {
# Or wrap relevant programs to add a suitable PATH ?
#runtimeDeps = [ gnused gnugrep ];
# disable stackprotector on aarch64-darwin for now
# build error:
# ```
# /private/tmp/nix-build-gambit-unstable-2020-09-20.drv-0/ccIjyeeb.s:207: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" ];
configureFlags = [
"--enable-targets=${gambit-params.targets}"
"--enable-single-host"