diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-09-07 18:19:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 18:19:36 +0000 |
| commit | 4b5104adc8f711170ee843d9b4f210ad833129b6 (patch) | |
| tree | d2eaa9367f6dbe971d505bb500e9581f233a0968 | |
| parent | 6496f9cf51b5fe536f7fc77616f5fbf7f1edab70 (diff) | |
| parent | 98bd1d651d1d6d23aae4c6a1a400713c1a9b4f48 (diff) | |
Merge pull request #189747 from tjni/gambit-stackprotector
gambit: reenable stackprotector on aarch64-darwin
| -rw-r--r-- | pkgs/development/compilers/gambit/bootstrap.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/gambit/build.nix | 9 |
2 files changed, 0 insertions, 18 deletions
diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index b81e64eaac32..a29f45a4e7a5 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -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 \ diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index 9f2907057183..029225629154 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -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" |