diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-19 22:09:45 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-20 00:59:19 -0400 |
| commit | 1fc12241edb27fc9bb40b2c191f2718493a7f895 (patch) | |
| tree | 91cac0ff5af7ff9fb5810349433880fd0d540bbb /pkgs/development | |
| parent | e19bb868dc55265cf99bb00ab542f96110b9cf6e (diff) | |
| download | nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.tar nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.tar.gz nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.tar.bz2 nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.tar.lz nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.tar.xz nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.tar.zst nixlib-1fc12241edb27fc9bb40b2c191f2718493a7f895.zip | |
all-packages: get rid of wrapCCCross
It's unneeded
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/emscripten-fastcomp/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix index e543f799495f..5d952073740e 100644 --- a/pkgs/development/compilers/emscripten-fastcomp/default.nix +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -4,10 +4,14 @@ let self = { emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; - emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - '' self.emscriptenfastcomp-unwrapped; + emscriptenfastcomp-wrapped = wrapCCWith { + cc = self.emscriptenfastcomp-unwrapped; + libc = stdenv.cc.libc; + extraBuildCommands = '' + # hardening flags break WASM support + cat > $out/nix-support/add-hardening.sh + ''; + }; emscriptenfastcomp = symlinkJoin { name = "emscriptenfastcomp"; paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; |