about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-08-15 19:10:21 -0700
committerAdam Joseph <adam@westernsemico.com>2023-08-15 19:10:23 -0700
commitdfb2f189af91d608cbc686edb01fc04df73da1fd (patch)
tree1f0540263b41131e377525cae780b3705aa63618
parentf409c8996879f458ccc04961c6a4d56acff32787 (diff)
libgcc: build arm-{isa,cpu}.h for all 32-bit arm, not just armv7
As reported here:

  https://github.com/NixOS/nixpkgs/pull/247900#issuecomment-1679258061
-rw-r--r--pkgs/development/libraries/gcc/libgcc/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index e2fbf55876fa1..c168113fa3c45 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -90,7 +90,7 @@ in stdenv.mkDerivation (finalAttrs: {
         insn-constants.h \
   '' + lib.optionalString stdenv.targetPlatform.isM68k ''
         sysroot-suffix.h \
-  '' + lib.optionalString stdenv.targetPlatform.isArmv7 ''
+  '' + lib.optionalString stdenv.targetPlatform.isAarch32 ''
         arm-isa.h \
         arm-cpu.h \
   '' + ''