bintools-wrapper: Import separately from cc-wrapper

2017-08-26 11:43:30 -04:00
parent 8e557ed2c5
commit 2bba929062
16 changed files with 150 additions and 77 deletions
--- a/pkgs/development/compilers/emscripten-fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, wrapCC, wrapCCWith, symlinkJoin }:
+{ newScope, stdenv, binutils-raw, wrapCCWith, symlinkJoin }:
 let
  callPackage = newScope (self // {inherit stdenv;});

@@ -6,6 +6,8 @@ let
    emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {};
    emscriptenfastcomp-wrapped = wrapCCWith {
      cc = self.emscriptenfastcomp-unwrapped;
+      # Never want Apple's cctools for WASM target
+      bintools = binutils-raw;
      libc = stdenv.cc.libc;
      extraBuildCommands = ''
        # hardening flags break WASM support