movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/staging-next' into staging

Browse source
This commit is contained in:
K900 2024-01-18 19:15:32 +03:00
commit 967d49b8a8
74 changed files with 1772 additions and 1094 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/compilers/gcc/common/configure-flags.nix
View file

@ -251,6 +251,11 @@ let
++ lib.optionals (targetPlatform.isMips && targetPlatform.parsed.abi.name == "gnu" && lib.versions.major version == "12") [
"--disable-libsanitizer"
]
++ lib.optionals targetPlatform.isAlpha [
# Workaround build failures like:
# cc1: error: fp software completion requires '-mtrap-precision=i' [-Werror]
"--disable-werror"
]
;
in configureFlags

2
pkgs/development/compilers/gcc/common/libgcc-buildstuff.nix
View file

@ -48,6 +48,6 @@ in
# https://www.openwall.com/lists/musl/2022/11/09/3
#
# 'parsed.cpu.family' won't be correct for every platform.
+ lib.optionalString (stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390) ''
+ lib.optionalString (stdenv.targetPlatform.isLoongArch64 || stdenv.targetPlatform.isS390 || stdenv.targetPlatform.isAlpha) ''
touch libgcc/config/${stdenv.targetPlatform.parsed.cpu.family}/crt{i,n}.S
''