p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switching to load from parallel jobs for #2920

This commit is contained in:
Tully Foote 2011-01-05 20:23:54 +00:00
parent e354ed7d8e
commit 64cbd76d8d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/rosmake/src/rosmake/rosmake.py
View File

@ -382,9 +382,9 @@ class RosMakeAll:
"""
local_env = os.environ.copy()
if self.ros_parallel_jobs > 0:
local_env['ROS_PARALLEL_JOBS'] = "-j%d" % self.ros_parallel_jobs
local_env['ROS_PARALLEL_JOBS'] = "-l%d" % self.ros_parallel_jobs
elif "ROS_PARALLEL_JOBS" not in os.environ: #if no environment setup and no args fall back to # cpus
local_env['ROS_PARALLEL_JOBS'] = "-j%d" % parallel_build.num_cpus()
local_env['ROS_PARALLEL_JOBS'] = "-l%d" % parallel_build.num_cpus()
local_env['SVN_CMDLINE'] = "svn --non-interactive"
cmd = ["bash", "-c", "cd %s && %s "%(self.get_path(package), make_command()) ] #UNIXONLY
if argument: