Merge pull request #169907 from trofi/fix-binutils-unwrapped-all-targets

binutils-unwrapped-all-targets: fix libctf breakage
main
Sergei Trofimovich 2 years ago committed by GitHub
commit c807c8c681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      pkgs/development/tools/misc/binutils/default.nix

@ -21,7 +21,7 @@ in
, enableGold ? execFormatIsELF stdenv.targetPlatform
, enableShared ? !stdenv.hostPlatform.isStatic
# WARN: Enabling all targets increases output size to a multiple.
, withAllTargets ? false, libbfd, libopcodes
, withAllTargets ? false
}:
# WARN: configure silently disables ld.gold if it's unsupported, so we need to
@ -183,11 +183,9 @@ stdenv.mkDerivation {
# Fails
doCheck = false;
postFixup = lib.optionalString (enableShared && withAllTargets) ''
rm "$out"/lib/lib{bfd,opcodes}-${version}.so
ln -s '${lib.getLib libbfd}/lib/libbfd-${version}.so' "$out/lib/"
ln -s '${lib.getLib libopcodes}/lib/libopcodes-${version}.so' "$out/lib/"
'';
# Remove on next bump. It's a vestige of past conditional. Stays here to avoid
# mass rebuild.
postFixup = "";
# INFO: Otherwise it fails with:
# `./sanity.sh: line 36: $out/bin/size: not found`

Loading…
Cancel
Save