Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-05-02 22:58:02 +00:00
parent 0fdde5efd0 94520a25ad
commit c92bca56f8
867 changed files with 75282 additions and 27025 deletions
@@ -33,7 +33,7 @@ let
          "$mod/Module.symvers"
      fi
      INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \
-      make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \
+      make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \
        "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action}
    done
  '';
@@ -146,7 +146,7 @@ in stdenv.mkDerivation {

  buildPhase = ''
    source env.sh
-    kmk BUILD_TYPE="${buildType}"
+    kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}"
    ${forEachModule "modules"}
  '';