diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-18 06:01:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 06:01:24 +0000 |
| commit | 4ad33a5c7c75c3187089b3e1a1c7f67bd8d1ddcd (patch) | |
| tree | 4fce4ad5c2d2f508fdfa3ad807e46af55387fab9 /pkgs/development/libraries/glibc/default.nix | |
| parent | 07b19b321028b2852e828475b60cd6e15b1e344a (diff) | |
| parent | 55328741511aee080912eafd94c1db82332d6c8a (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/glibc/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index f815e1eaa4789..ec57ef27e9460 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -64,8 +64,12 @@ callPackage ./common.nix { inherit stdenv; } { # store path than that determined when built (as a source for the # bootstrap-tools tarball) # Building from a proper gcc staying in the path where it was installed, - # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without + # libgcc_s will now be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. + # TODO: remove this hack. Things that rely on this hack today: + # - dejagnu: during linux bootstrap tcl SIGSEGVs + # - clang-wrapper in cross-compilation + # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948 preInstall = '' if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib |