--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Wed May 27 16:06:14 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Wed May 27 16:15:38 2009 -0500
@@ -2351,8 +2351,16 @@
abldArgs.add(TEST_CMD); //$NON-NLS-1$
}
+ String buildPlatform = "";
+ if ( config.getPlatformString().startsWith(ISymbianBuildContext.ARMV5_PLATFORM) &&
+ EpocEngineHelper.hasFeatureVariantKeyword(config.getCarbideProject(), componentPath)){
+ buildPlatform = config.getPlatformString().toLowerCase();
+ } else {
+ buildPlatform = config.getBasePlatformForVariation().toLowerCase();
+ }
+
abldArgs.add(MAKEFILE_CMD); //$NON-NLS-1$
- abldArgs.add(config.getPlatformString().toLowerCase());
+ abldArgs.add(buildPlatform);
abldArgs.add(componentPath.removeFileExtension().lastSegment());
for (String arg : config.getBuildArgumentsInfo().getAbldMakefileArgs().split(" ")) {