Skip to content

stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause#228281

Merged
1 commit merged intomasterfrom
unknown repository
Apr 27, 2023
Merged

stdenvBootstrapTools: drop no-longer-needed, now-broken cross clause#228281
1 commit merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Apr 26, 2023

Description of changes

The comment stating that "GCC has certain things built in statically" is no longer true as of #209870. Moreover, as pointed out in #228130 this optionalString block no longer builds for pkgsCross.*.freshBootstrapTools.

Things done

Tested with:

nix build --impure \
  --expr 'with import ./pkgs/top-level/release-cross.nix { supportedSystems = [builtins.currentSystem]; }; builtins.mapAttrs (k: v: v.build) bootstrapTools'
  • For platform(s)
  • aarch64
  • aarch64-musl
  • armv5tel
  • armv6l
  • armv6l-musl
  • armv7l
  • mips64el-linux-gnuabi64
  • mips64el-linux-gnuabin32 (testing fix: gcc: disable libsanitizer on mips64n32 #228296)
  • mipsel-linux-gnu
  • pogoplug4
  • powerpc64
  • powerpc64-musl
  • powerpc64le
  • powerpc64le-musl
  • riscv64
  • x86_64-musl

The comment stating that "GCC has certain things built in
statically" is no longer true as of
#209870.  Moreover, as pointed
out in #228130 this
optionalString block no longer builds for
pkgsCross.*.freshBootstrapTools.

It is safe to drop this clause now.
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 26, 2023
@github-actions github-actions bot added the 6.topic: stdenv Standard environment label Apr 26, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Apr 26, 2023
@ghost ghost marked this pull request as ready for review April 26, 2023 09:56
@ghost ghost mentioned this pull request Apr 26, 2023
12 tasks
@ghost ghost merged commit bc024e1 into NixOS:master Apr 27, 2023
@ghost ghost deleted the pr/bootstrapFiles/cross/fix branch April 27, 2023 03:58
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: stdenv Standard environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant