# HG changeset patch
# User timkelly
# Date 1273521878 18000
# Node ID 0f1865e991e57792a132b823ec4c3443d015703f
# Parent  dbf1ac834ec3e9f30bf95beeb9f8b535512420d0# Parent  2ff302f694051a32a09fd0e8309e0b162ba18994
merge commit

diff -r 2ff302f69405 -r 0f1865e991e5 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Mon May 10 14:10:25 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Mon May 10 15:04:38 2010 -0500
@@ -531,9 +531,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()) {
diff -r 2ff302f69405 -r 0f1865e991e5 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java	Mon May 10 14:10:25 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/BuildSettingsUI.java	Mon May 10 15:04:38 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$