riscv: Use gnumake42HEAD.
This commit is contained in:
parent
fb8a09e8f0
commit
43522dc851
@ -4,8 +4,6 @@ assert guileSupport -> ( pkgconfig != null && guile != null );
|
||||
|
||||
let
|
||||
version = "4.2.1";
|
||||
|
||||
needGlibcPatch = (stdenv.cc.libc.version or "") == "2.27";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "gnumake-${version}";
|
||||
@ -22,7 +20,7 @@ stdenv.mkDerivation {
|
||||
# included Makefiles, don't look in /usr/include and friends.
|
||||
./impure-dirs.patch
|
||||
./pselect.patch
|
||||
] ++ stdenv.lib.optional needGlibcPatch ./glibc-2.27.patch;
|
||||
];
|
||||
|
||||
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
|
||||
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
|
||||
|
@ -7661,7 +7661,9 @@ with pkgs;
|
||||
gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
|
||||
gnumake3 = gnumake382;
|
||||
gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { };
|
||||
gnumake = gnumake42;
|
||||
gnumake = if hostPlatform.isRiscV # Technically this check should be for glibc version.
|
||||
then gnumake42HEAD
|
||||
else gnumake42;
|
||||
gnumake42HEAD = callPackage ../development/tools/build-managers/gnumake/4.2/head.nix { };
|
||||
|
||||
gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {});
|
||||
|
Loading…
Reference in New Issue
Block a user