Merge pull request #187590 from trofi/libgccjit-lib-stripping-fix

libgccjit: don't try to enter into non-existent $lib output

Changed files
+13 -11
pkgs
+1 -1
pkgs/development/compilers/gcc/10/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/11/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/12/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/4.8/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/4.9/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/6/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/7/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/8/default.nix
···
(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;
+1 -1
pkgs/development/compilers/gcc/9/default.nix
···
(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;
+4 -2
pkgs/development/compilers/gcc/common/strip-attributes.nix
···
-
{ stdenv }:
+
{ lib, stdenv, langJit }:
{
# Note [Cross-compiler stripping]
···
lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/*.{a,o,so*}
)
popd
-
+
'' + lib.optionalString (!langJit) ''
+
${/*keep indentation*/ ""}
pushd $lib
local -ar libHostFiles=(
lib{,32,64}/*.{a,o,so*}
···
)
popd
+
'' + ''
eval "$oldOpts"
stripDebugList="$stripDebugList ''${outHostFiles[*]} ''${libHostFiles[*]}"