diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-08-14 13:34:42 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-08-14 15:08:59 -0700 |
| commit | 18c52d09bcd6c60bc60db81fe1a37d7663acaf27 (patch) | |
| tree | df3e255366ac6c49d89fa01d183853aae6865e89 | |
| parent | c0e4121ba537c10ef0a5132777bb35ae94735658 (diff) | |
libgcc: make needed architecture-specific targets if isArmv7
| -rw-r--r-- | pkgs/development/libraries/gcc/libgcc/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/test/cross/default.nix | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index afc42bccfb53..e2fbf55876fa 100644 --- 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 ) diff --git a/pkgs/test/cross/default.nix b/pkgs/test/cross/default.nix index 46bb3c8d522d..0b037b6057ec 100644 --- 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 |