pyrox.dev / nixpkgs
lol
fork atom

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

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

authored by Sergei Trofimovich and committed by GitHub 26c03f3b 54506fbd

+13 -11
unified split
+1 -1
pkgs/development/compilers/gcc/10/default.nix
··· 229 229 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 230 230 231 231 inherit 232 - (import ../common/strip-attributes.nix { inherit stdenv; }) 232 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 233 233 stripDebugList 234 234 stripDebugListTarget 235 235 preFixup;
+1 -1
pkgs/development/compilers/gcc/11/default.nix
··· 237 237 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 238 238 239 239 inherit 240 - (import ../common/strip-attributes.nix { inherit stdenv; }) 240 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 241 241 stripDebugList 242 242 stripDebugListTarget 243 243 preFixup;
+1 -1
pkgs/development/compilers/gcc/12/default.nix
··· 232 232 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 233 233 234 234 inherit 235 - (import ../common/strip-attributes.nix { inherit stdenv; }) 235 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 236 236 stripDebugList 237 237 stripDebugListTarget 238 238 preFixup;
+1 -1
pkgs/development/compilers/gcc/4.8/default.nix
··· 236 236 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 237 237 238 238 inherit 239 - (import ../common/strip-attributes.nix { inherit stdenv; }) 239 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 240 240 stripDebugList 241 241 stripDebugListTarget 242 242 preFixup;
+1 -1
pkgs/development/compilers/gcc/4.9/default.nix
··· 256 256 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 257 257 258 258 inherit 259 - (import ../common/strip-attributes.nix { inherit stdenv; }) 259 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 260 260 stripDebugList 261 261 stripDebugListTarget 262 262 preFixup;
+1 -1
pkgs/development/compilers/gcc/6/default.nix
··· 268 268 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 269 269 270 270 inherit 271 - (import ../common/strip-attributes.nix { inherit stdenv; }) 271 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 272 272 stripDebugList 273 273 stripDebugListTarget 274 274 preFixup;
+1 -1
pkgs/development/compilers/gcc/7/default.nix
··· 235 235 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 236 236 237 237 inherit 238 - (import ../common/strip-attributes.nix { inherit stdenv; }) 238 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 239 239 stripDebugList 240 240 stripDebugListTarget 241 241 preFixup;
+1 -1
pkgs/development/compilers/gcc/8/default.nix
··· 216 216 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 217 217 218 218 inherit 219 - (import ../common/strip-attributes.nix { inherit stdenv; }) 219 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 220 220 stripDebugList 221 221 stripDebugListTarget 222 222 preFixup;
+1 -1
pkgs/development/compilers/gcc/9/default.nix
··· 231 231 (if profiledCompiler then "profiledbootstrap" else "bootstrap"); 232 232 233 233 inherit 234 - (import ../common/strip-attributes.nix { inherit stdenv; }) 234 + (import ../common/strip-attributes.nix { inherit lib stdenv langJit; }) 235 235 stripDebugList 236 236 stripDebugListTarget 237 237 preFixup;
+4 -2
pkgs/development/compilers/gcc/common/strip-attributes.nix
··· 1 - { stdenv }: 1 + { lib, stdenv, langJit }: 2 2 3 3 { 4 4 # Note [Cross-compiler stripping] ··· 48 48 lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/*.{a,o,so*} 49 49 ) 50 50 popd 51 - 51 + '' + lib.optionalString (!langJit) '' 52 + ${/*keep indentation*/ ""} 52 53 pushd $lib 53 54 local -ar libHostFiles=( 54 55 lib{,32,64}/*.{a,o,so*} ··· 58 59 ) 59 60 popd 60 61 62 + '' + '' 61 63 eval "$oldOpts" 62 64 63 65 stripDebugList="$stripDebugList ''${outHostFiles[*]} ''${libHostFiles[*]}"