diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-08-20 12:51:36 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-08-20 12:51:36 +0100 |
commit | 1f7186ab5c6e9a2f282941617cec79479974fd74 (patch) | |
tree | a05d6def1542802a7786daec489e7a682ebacc68 /pkgs/development/compilers/gcc/10/default.nix | |
parent | bbb80bc7e96894830bdf43029d204ca5ca9d1a25 (diff) |
libgccjit: don't try to enter into non-existent $lib output
Fixes build failure on `staging-next` introduced by commit c817efe6 ("gcc: extend stripping of .a libraries and .o objects"): ...-bootstrap-stage3-stdenv-linux/setup: line 106: pushd: no other directory Build failure happens because `libgccjit` has different `outputs` layout compared to the rest of `gcc` derivations: outputs = [ "out" "man" "info" ] ++ lib.optional (!langJit) "lib"; The change carves out `$lib` lib handling part to avoid `gcc` rebuild in `staging-next`.
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index dbfdbb79be995..8082bef14ea72 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -229,7 +229,7 @@ stdenv.mkDerivation ({ (if profiledCompiler then "profiledbootstrap" else "bootstrap"); inherit - (import ../common/strip-attributes.nix { inherit stdenv; }) + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) stripDebugList stripDebugListTarget preFixup; |