Merge pull request #254334 from jiegec/glibc-libutil

glibc: use libutil.a when libutil.so.1 is unavailable

authored by Maximilian Bosch and committed by GitHub 7cd09e80 9fd82b38

+3 -1
+3 -1
pkgs/development/libraries/glibc/default.nix
··· 145 ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so 146 ln -sf $out/lib/librt.so.1 $out/lib/librt.so 147 ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so 148 - ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so 149 touch $out/lib/libpthread.a 150 151 # Put libraries for static linking in a separate output. Note ··· 154 mkdir -p $static/lib 155 mv $out/lib/*.a $static/lib 156 mv $static/lib/lib*_nonshared.a $out/lib 157 # Some of *.a files are linker scripts where moving broke the paths. 158 sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ 159 -i "$static"/lib/*.a
··· 145 ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so 146 ln -sf $out/lib/librt.so.1 $out/lib/librt.so 147 ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so 148 + test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so 149 touch $out/lib/libpthread.a 150 151 # Put libraries for static linking in a separate output. Note ··· 154 mkdir -p $static/lib 155 mv $out/lib/*.a $static/lib 156 mv $static/lib/lib*_nonshared.a $out/lib 157 + # If libutil.so.1 is missing, libutil.a is required. 158 + test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib 159 # Some of *.a files are linker scripts where moving broke the paths. 160 sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ 161 -i "$static"/lib/*.a