diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-07-06 16:17:13 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-07-06 16:17:13 +0200 |
commit | 7c25c1fd888e9df9b69cbf0941a765ae88c3939a (patch) | |
tree | 659aafd3a77b7e571c4de512a3d95370272ff4b9 /pkgs/stdenv | |
parent | eb5659f4c272444b3c3898afd6e77bab303763f6 (diff) | |
parent | 25b20757e8c2e929ded0215eeaad19382497c318 (diff) |
Merge branch 'glibc-2.33' into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 63a37d54547d7..1fbd3cba27ef2 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -258,6 +258,25 @@ in # Rewrap the binutils with the new glibc, so both the next # stage's wrappers use it. libc = getLibc self; + + # Unfortunately, when building gcc in the next stage, its LTO plugin + # would use the final libc but `ld` would use the bootstrap one, + # and that can fail to load. Therefore we upgrade `ld` to use newer libc; + # apparently the interpreter needs to match libc, too. + bintools = self.stdenvNoCC.mkDerivation { + inherit (prevStage.bintools.bintools) name; + dontUnpack = true; + dontBuild = true; + # We wouldn't need to *copy* all, but it's easier and the result is temporary anyway. + installPhase = '' + mkdir -p "$out"/bin + cp -a '${prevStage.bintools.bintools}'/bin/* "$out"/bin/ + chmod +w "$out"/bin/ld.bfd + patchelf --set-interpreter '${getLibc self}'/lib/ld*.so.? \ + --set-rpath "${getLibc self}/lib:$(patchelf --print-rpath "$out"/bin/ld.bfd)" \ + "$out"/bin/ld.bfd + ''; + }; }; }; }) |