--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Jun 29 15:14:38 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Jun 29 18:12:58 2010 -0500
@@ -534,9 +534,11 @@
args.add("-d"); //$NON-NLS-1$
}
+ args.add("-j"); //$NON-NLS-1$
if (buildConfig.getCarbideProject().isConcurrentBuildingEnabled()) {
- args.add("-j"); //$NON-NLS-1$
args.add(Integer.toString(cpi.concurrentBuildJobs()));
+ } else {
+ args.add(Integer.toString(1));
}
if (cpi.shouldOverrideMakeEngine()) {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java Tue Jun 29 15:14:38 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java Tue Jun 29 18:12:58 2010 -0500
@@ -141,7 +141,7 @@
concurrentBuildJobsLabel.setLayoutData(gd);
concurrentBuildJobsControl = new Spinner(content, SWT.BORDER | SWT.READ_ONLY);
- concurrentBuildJobsControl.setValues(0, 2, 50, 0, 1, 4);
+ concurrentBuildJobsControl.setValues(0, 1, 50, 0, 1, 4);
concurrentBuildJobsControl.setBackground(shell.getDisplay().getSystemColor(SWT.COLOR_WHITE));
concurrentBuildJobsControl.setEnabled(useConcurrentBuildingCheck.getSelection());
concurrentBuildJobsControl.setToolTipText(Messages.getString("SharedPrefs.ConcurrentBuildJobsToolTip")); //$NON-NLS-1$