# HG changeset patch
# User timkelly
# Date 1270220516 18000
# Node ID 8d5b825f0a7478cb57f52289c190b9dd9992cb6c
# Parent  0af9cb0ed84ec604d26a6de6ff2691b03b5df107
fix bug 11019

diff -r 0af9cb0ed84e -r 8d5b825f0a74 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	Thu Apr 01 13:25:16 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java	Fri Apr 02 10:01:56 2010 -0500
@@ -502,6 +502,7 @@
 		args.add("-c"); //$NON-NLS-1$
 		String configName = getConfigName(buildConfig);
 		if (configName == null){ 
+			//TODO: Try to contrive if the project hasn't yet been converted.....
 			configName = "error_retrieving_sbs_config"; 
 		}
 		if (isTest) {
@@ -585,9 +586,12 @@
 		ICarbideProjectInfo cpi = buildConfig.getCarbideProject();
 		IPath workingDirectory = cpi.getINFWorkingDirectory();
 		
-		String buildTarget = buildConfig.getPlatformString().toLowerCase() + "_" + buildConfig.getTargetString().toLowerCase();
-		
-		String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, buildTarget, COMPONENT_ARG, fullMMPPath.toFile().getName()};
+		String configName = getConfigName(buildConfig);
+		if (configName == null){ 
+			//TODO: Try to contrive if the project hasn't yet been converted.....
+			configName = "error_retrieving_sbs_config"; 
+		}
+		String[] sbsArgs = new String[] {"--source-target=" + file.toOSString(), COMPILE_ARG, configName, COMPONENT_ARG, fullMMPPath.toFile().getName()};
 		launcher.setErrorParserManager(buildConfig.getCarbideProject().getINFWorkingDirectory(), buildConfig.getErrorParserList());
 		
 		int retVal = launcher.executeCommand(SBS_BAT, sbsArgs, getResolvedEnvVars(buildConfig), workingDirectory);