# HG changeset patch
# User wpaul
# Date 1239205324 18000
# Node ID b7d854010c8df9aff7581bb3c099d48de1a18ac5
# Parent  e2b416032b5bf5b4ba595d7d79cdeb1123ddaeb7# Parent  27e53e1abc19da8931c71092bed801dafb42dc02
merged

diff -r 27e53e1abc19 -r b7d854010c8d builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Wed Apr 08 10:32:45 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Wed Apr 08 10:42:04 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;
 					}