about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2017-02-21T13·52+0100
committerEelco Dolstra <edolstra@gmail.com>2017-02-21T13·52+0100
commite4dd7dadf4f52a2afef0fcd826d8c85ec13cd904 (patch)
treead358a394b966a4f9ce5629d62ed62fb39c09839
parentbb6656b8a259f2ad0f90536ee32bc3080e466f1a (diff)
RPM build: Use parallel make
-rw-r--r--nix.spec.in2
-rw-r--r--release.nix3
2 files changed, 3 insertions, 2 deletions
diff --git a/nix.spec.in b/nix.spec.in
index 2447f13a8f84..0c9b9ab20133 100644
--- a/nix.spec.in
+++ b/nix.spec.in
@@ -107,7 +107,7 @@ extraFlags=
 %configure --localstatedir=/nix/var \
            --docdir=%{_defaultdocdir}/%{name}-doc-%{version} \
            $extraFlags
-make %{?_smp_flags}
+make -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES
 %{_emacs_bytecompile} misc/emacs/nix-mode.el
 
 
diff --git a/release.nix b/release.nix
index 8d71cc841c75..0b5b5579b267 100644
--- a/release.nix
+++ b/release.nix
@@ -284,9 +284,10 @@ let
         { extraPackages =
             [ "perl-DBD-SQLite" "perl-devel" "sqlite" "sqlite-devel" "bzip2-devel" "emacs" "libcurl-devel" "openssl-devel" "xz-devel" ]
             ++ extraPackages; };
-      memSize = 1024;
+      memSize = 8192;
       meta.schedulingPriority = 50;
       postRPMInstall = "cd /tmp/rpmout/BUILD/nix-* && make installcheck";
+      enableParallelBuilding = true;
     };