Re-revert "Merge: glibc: 2.24 -> 2.25"
This reverts commit 55cc7700e9.
I hope most problems have been solved. /cc #22874.
This commit is contained in:
@@ -10,8 +10,8 @@ cross:
|
||||
, preConfigure ? "", ... }@args:
|
||||
|
||||
let
|
||||
version = "2.24";
|
||||
sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
|
||||
version = "2.25";
|
||||
sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
|
||||
in
|
||||
|
||||
assert cross != null -> gccCross != null;
|
||||
@@ -138,7 +138,7 @@ stdenv.mkDerivation ({
|
||||
lib.optionalString (cross != null) "-${cross.config}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
|
||||
url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ in
|
||||
# to bootstrap-tools; on cross-arm this stripping would break objects.
|
||||
if [ -z "$crossConfig" ]; then
|
||||
for i in "$out"/lib/*.a; do
|
||||
strip -S "$i"
|
||||
[ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user