From ad507954fa0401b12131fe7f0461791fdd0e688e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 6 Jan 2017 09:43:52 +0100 Subject: [PATCH] emscriptenfastcomp-wrapped: disable hardening The hardening flags break webassembly generation, at least in some cases. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f07b69fb81b..86f5abc7fb4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1546,7 +1546,10 @@ in emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { }; - emscriptenfastcomp-wrapped = wrapCC emscriptenfastcomp-unwrapped; + emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc '' + # hardening flags break WASM support + cat > $out/nix-support/add-hardening.sh + '' emscriptenfastcomp-unwrapped; emscriptenfastcomp = symlinkJoin { name = "emscriptenfastcomp"; paths = [ emscriptenfastcomp-wrapped emscriptenfastcomp-unwrapped ];