From c0008c5b63922a659f1f417e35ece7ddfc74f455 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 13 Mar 2020 16:26:41 -0400 Subject: [PATCH 1/2] gcc: fix musl cross-compiler on i686 --- pkgs/development/compilers/gcc/builder.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index b153687980a0..22a21e5b25c6 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -201,11 +201,11 @@ postConfigure() { preInstall() { + mkdir -p "$out/${targetConfig}/lib" + mkdir -p "$lib/${targetConfig}/lib" # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p "$out/${targetConfig}/lib" ln -s lib "$out/${targetConfig}/lib64" - mkdir -p "$lib/${targetConfig}/lib" ln -s lib "$lib/${targetConfig}/lib64" fi } From 83fa0d940012decf0cbd301b7795b7fa00a49739 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 13 Mar 2020 17:46:55 -0400 Subject: [PATCH 2/2] Revert "gcc: minimal hacky fixup for our pkgsi686Linux.nix" This reverts commit b6ae8193edd5fb5188565d6163c86e76a096a500. --- pkgs/development/compilers/gcc/9/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index f660a59a790a..7ff8d7529ca3 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -245,12 +245,6 @@ 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.is32bit - then ''mkdir "$lib"'' - else null; - meta = { homepage = https://gcc.gnu.org/; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+