--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Tue Apr 07 18:07:46 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Wed Apr 08 10:40:18 2009 -0500
@@ -206,7 +206,10 @@
else {
String epocRootStr = epocRoot.toOSString();
if (epocRootStr.indexOf(":") == 1) {
- epocRootStr = epocRootStr.substring(2);
+ // only strip the drive for SBSv1
+ if (!CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(projectTracker.getProject())) {
+ epocRootStr = epocRootStr.substring(2);
+ }
}
returnEnvArray[i] = EPOCROOT + EQUALS + epocRootStr;
}
@@ -286,7 +289,10 @@
else {
String epocRootStr = epocRoot.toOSString();
if (epocRootStr.indexOf(":") == 1) {
- epocRootStr = epocRootStr.substring(2);
+ // only strip the drive for SBSv1
+ if (!CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(projectTracker.getProject())) {
+ epocRootStr = epocRootStr.substring(2);
+ }
}
returnEnvArray[i] = EPOCROOT + EQUALS + epocRootStr;
}