stdenv: Nix-driven bootstrap of gcc #209870
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,10 +45,8 @@ testers.nixosTest { | |
| """) | ||
| ''; | ||
| meta = { | ||
| maintainers = with lib.maintainers; [ | ||
| roberth | ||
| ]; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| { lib | ||
| , stdenv | ||
| , nukeReferences | ||
| , langC | ||
| , langCC | ||
| , runtimeShell | ||
| }: | ||
|
|
||
| let | ||
| enableChecksum = (with stdenv; buildPlatform == hostPlatform && hostPlatform == targetPlatform) && langC && langCC; | ||
| in | ||
| (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs enableChecksum { | ||
| outputs = previousAttrs.outputs ++ lib.optionals enableChecksum [ "checksum" ]; | ||
| # This is a separate phase because gcc assembles its phase scripts | ||
| # in bash instead of nix (we should fix that). | ||
| preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "postInstallSaveChecksumPhase" ]; | ||
| # | ||
| # gcc uses an auxiliary utility `genchecksum` to md5-hash (most of) its | ||
| # `.o` and `.a` files prior to linking (in case the linker is | ||
| # nondeterministic). Since we want to compare across gccs built from two | ||
| # separate derivations, we wrap `genchecksum` with a `nuke-references` | ||
| # call. We also stash copies of the inputs to `genchecksum` in | ||
| # `$checksum/inputs/` -- this is extremely helpful for debugging since | ||
| # it's hard to get Nix to not delete the $NIX_BUILD_TOP of a successful | ||
| # build. | ||
| # | ||
| postInstallSaveChecksumPhase = '' | ||
| mv gcc/build/genchecksum gcc/build/.genchecksum-wrapped | ||
| cat > gcc/build/genchecksum <<\EOF | ||
| #!${runtimeShell} | ||
| ${nukeReferences}/bin/nuke-refs $@ | ||
| for INPUT in "$@"; do install -Dt $INPUT $checksum/inputs/; done | ||
| exec build/.genchecksum-wrapped $@ | ||
| EOF | ||
| chmod +x gcc/build/genchecksum | ||
| rm gcc/*-checksum.* | ||
| make -C gcc cc1-checksum.o cc1plus-checksum.o | ||
| install -Dt $checksum/checksums/ gcc/cc*-checksum.o | ||
| ''; | ||
| })) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| { lib | ||
| , stdenv | ||
| , langC | ||
| , langCC | ||
| , langJit | ||
| }: | ||
|
|
||
| let | ||
| enableLibGccOutput = (with stdenv; targetPlatform == hostPlatform) && !langJit; | ||
| in | ||
| (pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) { | ||
| outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ]; | ||
| # This is a separate phase because gcc assembles its phase scripts | ||
| # in bash instead of nix (we should fix that). | ||
| preFixupPhases = (previousAttrs.preFixupPhases or []) ++ [ "preFixupLibGccPhase" ]; | ||
| preFixupLibGccPhase = | ||
| # delete extra/unused builds of libgcc_s in non-langC builds | ||
| # (i.e. libgccjit, gnat, etc) to avoid potential confusion | ||
| lib.optionalString (!langC) '' | ||
| rm -f $out/lib/libgcc_s.so* | ||
| '' | ||
|
|
||
| # TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them | ||
| # with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's | ||
| # `$out/nix-support/cc-flags`. See also: | ||
| # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130614895 | ||
| # - https://github.com/NixOS/nixpkgs/pull/209870#discussion_r1130635982 | ||
| # - https://github.com/NixOS/nixpkgs/commit/404155c6acfa59456aebe6156b22fe385e7dec6f | ||
| # | ||
| # move `libgcc_s.so` into its own output, `$libgcc` | ||
| + lib.optionalString enableLibGccOutput ('' | ||
| # move libgcc from lib to its own output (libgcc) | ||
| mkdir -p $libgcc/lib | ||
| mv $lib/lib/libgcc_s.so $libgcc/lib/ | ||
| mv $lib/lib/libgcc_s.so.1 $libgcc/lib/ | ||
| ln -s $libgcc/lib/libgcc_s.so $lib/lib/ | ||
| ln -s $libgcc/lib/libgcc_s.so.1 $lib/lib/ | ||
This conversation was marked as resolved.
Outdated
Show resolved
Hide resolved
|
||
| '' | ||
| # | ||
| # Nixpkgs ordinarily turns dynamic linking into pseudo-static linking: | ||
| # libraries are still loaded dynamically, exactly which copy of each | ||
| # library is loaded is permanently fixed at compile time (via RUNPATH). | ||
| # For libgcc_s we must revert to the "impure dynamic linking" style found | ||
| # in imperative software distributions. We must do this because | ||
| # `libgcc_s` calls `malloc()` and therefore has a `DT_NEEDED` for `libc`, | ||
| # which creates two problems: | ||
| # | ||
| # 1. A circular package dependency `glibc`<-`libgcc`<-`glibc` | ||
| # | ||
| # 2. According to the `-Wl,-rpath` flags added by Nixpkgs' `ld-wrapper`, | ||
| # the two versions of `glibc` in the cycle above are actually | ||
| # different packages. The later one is compiled by this `gcc`, but | ||
| # the earlier one was compiled by the compiler *that compiled* this | ||
| # `gcc` (usually the bootstrapFiles). In any event, the `glibc` | ||
| # dynamic loader won't honor that specificity without namespaced | ||
| # manual loads (`dlmopen()`). Once a `libc` is present in the address | ||
| # space of a process, that `libc` will be used to satisfy all | ||
| # `DT_NEEDED`s for `libc`, regardless of `RUNPATH`s. | ||
| # | ||
| # So we wipe the RUNPATH using `patchelf --set-rpath ""`. We can't use | ||
| # `patchelf --remove-rpath`, because at least as of patchelf 0.15.0 it | ||
| # will leave the old RUNPATH string in the file where the reference | ||
| # scanner can still find it: | ||
| # | ||
| # https://github.com/NixOS/patchelf/issues/453 | ||
| # | ||
| # Note: we might be using the bootstrapFiles' copy of patchelf, so we have | ||
| # to keep doing it this way until both the issue is fixed *and* all the | ||
| # bootstrapFiles are regenerated, on every platform. | ||
| # | ||
| # This patchelfing is *not* effectively equivalent to copying | ||
| # `libgcc_s` into `glibc`'s outpath. There is one minor and one | ||
| # major difference: | ||
| # | ||
| # 1. (Minor): multiple builds of `glibc` (say, with different | ||
| # overrides or parameters) will all reference a single store | ||
| # path: | ||
| # | ||
| # /nix/store/xxx...xxx-gcc-libgcc/lib/libgcc_s.so.1 | ||
| # | ||
| # This many-to-one referrer relationship will be visible in the store's | ||
| # dependency graph, and will be available to `nix-store -q` queries. | ||
| # Copying `libgcc_s` into each of its referrers would lose that | ||
| # information. | ||
| # | ||
| # 2. (Major): by referencing `libgcc_s.so.1`, rather than copying it, we | ||
| # are still able to run `nix-store -qd` on it to find out how it got | ||
| # built! Most importantly, we can see from that deriver which compiler | ||
| # was used to build it (or if it is part of the unpacked | ||
| # bootstrap-files). Copying `libgcc_s.so.1` from one outpath to | ||
| # another eliminates the ability to make these queries. | ||
| # | ||
| + '' | ||
| patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1 | ||
| ''); | ||
| })) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.