From b6ae8193edd5fb5188565d6163c86e76a096a500 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 13 Mar 2020 08:34:50 +0100 Subject: gcc: minimal hacky fixup for our pkgsi686Linux.nix This has been blocking nixos-unstable channel through i686 ISO: Fixes #82435, closes #82436. https://hydra.nixos.org/build/114512204 --- pkgs/development/compilers/gcc/9/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/development/compilers/gcc/9/default.nix') diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7ff8d7529ca..8dc93a8ae8f 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -245,6 +245,12 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; + # In this particular combination it stopped creating lib output at all. + # TODO: perhaps find a better fix? (ideally understand what's going on) + postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.isi686 + then ''mkdir "$lib"'' + else null; + meta = { homepage = https://gcc.gnu.org/; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ -- cgit 1.4.1 From e1d58266d55a91477d57b0715e3328968419663e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 13 Mar 2020 12:27:02 +0100 Subject: gcc: tweak platform condition in the hack from b6ae8193 It was rightly noted that armv7l suffers from the same issue: https://hydra.nixos.org/build/114263466#tabs-buildsteps --- pkgs/development/compilers/gcc/9/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/compilers/gcc/9/default.nix') diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 8dc93a8ae8f..f660a59a790 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -247,7 +247,7 @@ stdenv.mkDerivation ({ # In this particular combination it stopped creating lib output at all. # TODO: perhaps find a better fix? (ideally understand what's going on) - postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.isi686 + postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit then ''mkdir "$lib"'' else null; -- cgit 1.4.1