libgcc: make needed architecture-specific targets if isArmv7

2023-08-14 13:34:42 -07:00 · 2023-08-14 13:34:42 -07:00 · 18c52d09bc
commit 18c52d09bc
parent c0e4121ba5
2 changed files with 4 additions and 0 deletions
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@ -90,6 +90,9 @@ in stdenv.mkDerivation (finalAttrs: {
        insn-constants.h \
  '' + lib.optionalString stdenv.targetPlatform.isM68k ''
        sysroot-suffix.h \
+  '' + lib.optionalString stdenv.targetPlatform.isArmv7 ''
+        arm-isa.h \
+        arm-cpu.h \
  '' + ''
        insn-modes.h
    )
--- a/pkgs/test/cross/default.nix
+++ b/pkgs/test/cross/default.nix
@ -134,6 +134,7 @@ let
    pkgs.pkgsLLVM.stdenv
    pkgs.pkgsStatic.bash
    pkgs.pkgsCross.arm-embedded.stdenv
+    pkgs.pkgsCross.armv7l-hf-multiplatform.stdenv
    pkgs.pkgsCross.m68k.stdenv
    pkgs.pkgsCross.aarch64-multiplatform.pkgsBuildTarget.gcc
    pkgs.pkgsCross.powernv.pkgsBuildTarget.gcc