about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2017-01-06 09:43:52 +0100
committerGabriel Ebner <gebner@gebner.org>2017-01-06 09:43:52 +0100
commitad507954fa0401b12131fe7f0461791fdd0e688e (patch)
treeca30391e15313bbdd24385263b88f7e5b28d2a3b /pkgs
parentd30a17bc2c94a345779bc602e48a86c2d04cbb5c (diff)
downloadnixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.tar
nixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.tar.gz
nixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.tar.bz2
nixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.tar.lz
nixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.tar.xz
nixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.tar.zst
nixlib-ad507954fa0401b12131fe7f0461791fdd0e688e.zip
emscriptenfastcomp-wrapped: disable hardening
The hardening flags break webassembly generation, at least in some
cases.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 4 insertions, 1 deletions
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 ];