musl: 1.1.16 -> 1.1.17, build with stack protector

This commit is contained in:
Will Dietz 2017-10-19 15:57:19 -05:00
parent acd80042a4
commit 4eb090efc8

View file

@ -2,17 +2,17 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "musl-${version}"; name = "musl-${version}";
version = "1.1.16"; version = "1.1.17";
src = fetchurl { src = fetchurl {
url = "http://www.musl-libc.org/releases/${name}.tar.gz"; url = "http://www.musl-libc.org/releases/${name}.tar.gz";
sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; sha256 = "0r0lyp2w6v2bvm8h1si7w3p2qx037szl14qnxm5p00568z3m3an8";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
# required to avoid busybox segfaulting on startup when invoking # Disable auto-adding stack protector flags,
# nix-build "<nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix>" # so musl can selectively disable as needed
hardeningDisable = [ "stackprotector" ]; hardeningDisable = [ "stackprotector" ];
preConfigure = '' preConfigure = ''
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-shared" "--enable-shared"
"--enable-static" "--enable-static"
"CFLAGS=-fstack-protector-strong"
]; ];
patches = []; patches = [];