Mercurial > octave-nkf

comparison scripts/pkg/private/configure_make.m @ 19637:b74ae93040e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
limit number of jobs for make command to 1 under windows (bug #44053) * scripts/pkg/private/configure_make.m: set jobs as 1 in pc, nproc ("overridable") if not pc
author Avinoam Kalma
date Wed, 21 Jan 2015 21:19:38 -0500
parents e33427a854ec
children 4197fc428c7d
comparison
equal deleted inserted replaced
19636:f3ac54ac2c6a 19637:b74ae93040e8
77 error ("pkg: error running the configure script for %s.", desc.name); 77 error ("pkg: error running the configure script for %s.", desc.name);
78 endif 78 endif
79 endif 79 endif
80 80
81 ## Make. 81 ## Make.
82 if (ispc ())
83 jobs = 1;
84 else
85 jobs = nproc ("overridable");
86 endif
87
82 if (exist (fullfile (src, "Makefile"), "file")) 88 if (exist (fullfile (src, "Makefile"), "file"))
83 [status, output] = shell (sprintf ("%s make --jobs %i --directory '%s'", 89 [status, output] = shell (sprintf ("%s make --jobs %i --directory '%s'",
84 scenv, nproc ("overridable"), src), 90 scenv, jobs, src), verbose);
85 verbose);
86 if (status != 0) 91 if (status != 0)
87 rmdir (desc.dir, "s"); 92 rmdir (desc.dir, "s");
88 disp (output); 93 disp (output);
89 error ("pkg: error running `make' for the %s package.", desc.name); 94 error ("pkg: error running `make' for the %s package.", desc.name);
90 endif 95 endif