# HG changeset patch # User timkelly # Date 1270221154 18000 # Node ID 5e766307f8d6964afd544cf3302c3ec4fed03a84 # Parent 4fe29ed5e622fc641dddc70197b47772054c814f fix bug 11019 (regression) diff -r 4fe29ed5e622 -r 5e766307f8d6 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 11:55:03 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Fri Apr 02 10:12:34 2010 -0500 @@ -581,9 +581,11 @@ 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){ + 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(