diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-07-30 09:43:09 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-07-30 16:27:18 +0100 |
| commit | 7adf0a4eeb0ac19b07ca17f27e20ca4cee12df3d (patch) | |
| tree | 3b47ea0f00c18552041ab2a8d610303a1ac28bf2 /pkgs/build-support/setup-hooks | |
| parent | a934dd56171b3d3141f2b9490e4c101516d045a0 (diff) | |
setup-hooks/strip: resolve/uniq symlinks before stripping
Before the change the hook had a chance to run `strip` against the same file using multiple link paths. In case of `gcc` `libgcc.a` was stripped multiple times in parallel and produces corrupted archive. The change runs inputs via `realpath | uniq` to make sure we don't attempt to strip the same files multiple times.
Diffstat (limited to 'pkgs/build-support/setup-hooks')
| -rw-r--r-- | pkgs/build-support/setup-hooks/strip.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index 1d65c10c52308..5f53e7e95b2ef 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -68,6 +68,11 @@ stripDirs() { striperr="$(mktemp 'striperr.XXXXXX')" # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh. find $paths -type f -a '!' -path "$prefix/lib/debug/*" -print0 | + # Make sure we process files under symlinks only once. Otherwise + # 'strip` can corrupt files when writes to them in parallel: + # https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039 + xargs -r -0 -n1 -- realpath -z | sort -u -z | + xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$? # xargs exits with status code 123 if some but not all of the # processes fail. We don't care if some of the files couldn't |