--- a/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Thu Sep 16 00:04:43 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/META-INF/MANIFEST.MF	Thu Sep 16 09:07:54 2010 -0500
@@ -18,7 +18,6 @@
  org.eclipse.emf.ecore.xmi,
  org.eclipse.ui.ide,
  com.nokia.carbide.cpp.sdk.ui,
- com.nokia.carbide.cpp.x86build,
  org.eclipse.ui.navigator.resources,
  com.nokia.carbide.cpp.qt.core,
  org.eclipse.debug.core

--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/CarbideBuilderPlugin.java	Thu Sep 16 00:04:43 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/CarbideBuilderPlugin.java	Thu Sep 16 09:07:54 2010 -0500
@@ -44,11 +44,13 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.osgi.service.datalocation.Location;
 import org.eclipse.ui.*;
 import org.eclipse.ui.navigator.resources.ProjectExplorer;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import java.net.URL;
 import java.util.*;
 
 /**
@@ -97,7 +99,7 @@
 	private static ListenerList<ICarbideProjectPropertyChangedListener> ppListeners = new ListenerList<ICarbideProjectPropertyChangedListener>();
 	
 	private static List<IEnvironmentModifier> envModifiers = null;
-
+	private static IPath x86BuildDirectoryPath;
 	
 	/**
 	 * The constructor
@@ -142,6 +144,12 @@
 		super.start(context);
 		
 		CoreModel.getDefault().getProjectDescriptionManager().addCProjectDescriptionListener(this, CProjectDescriptionEvent.APPLIED);
+		
+		Location installLocation = Platform.getInstallLocation();
+		URL installURL = installLocation.getURL();
+		IPath installPath = new Path(installURL.getFile());
+
+		x86BuildDirectoryPath = installPath.append("x86Build"); //$NON-NLS-1$
 	}
 
 	/*
@@ -449,4 +457,8 @@
 		
 		return envModifiers;
 	}
+
+	public static IPath getX86BuildDirectoryPath() {
+		return x86BuildDirectoryPath;
+	}
 }

--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Thu Sep 16 00:04:43 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java	Thu Sep 16 09:07:54 2010 -0500
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.cdt.core.resources.IConsole;
 import org.eclipse.cdt.utils.spawner.EnvironmentReader;
@@ -63,7 +62,6 @@
 import com.nokia.carbide.cdt.internal.builder.CarbideSBSv1Builder;
 import com.nokia.carbide.cdt.internal.builder.CarbideSBSv2Builder;
 import com.nokia.carbide.cdt.internal.builder.ICarbideBuilder;
-import com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage;
 import com.nokia.carbide.cdt.internal.builder.ui.MMPSelectionDialog;
 import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.cpp.epoc.engine.MMPDataRunnableAdapter;
@@ -77,7 +75,6 @@
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildContext;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildContext;
 import com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin;
-import com.nokia.carbide.cpp.internal.x86build.X86BuildPlugin;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
 import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.EPKGLanguage;
@@ -306,8 +303,6 @@
 		launcher.writeToConsole("\n***Building project \"" + cpi.getProject().getName() + "\" for configuration \"" + buildConfig.getDisplayString() + "\"\n");
 		
 		getBuilder(cpi.getProject()).preBuildStep(buildConfig, launcher);
-		
-		runPreBuildChecks(buildConfig, launcher);
 
 		if (SHOW_ENV_VARS){ 
 			launcher.writeToConsole("\n***Printing environment variables modified from default:\n");
@@ -508,7 +503,6 @@
 
 		boolean result = false;
 		if (action == BUILD_COMPONENT_ACTION) {
-			runPreBuildChecks(buildConfig, launcher);
 
 			launcher.writeToConsole("\n***Building component \"" + componentName + "\" for configuration \"" + buildConfig.getDisplayString() + "\"\n");
 			
@@ -605,8 +599,6 @@
 		IPath fullMMPPath = tempPath.get(0);
 
 		launcher.writeToConsole("\n***Compiling file \"" + file.toOSString() + "\" for configuration \"" + buildConfig.getDisplayString() + "\"\n");
-		
-		runPreBuildChecks(buildConfig, launcher);
 
 		getBuilder(cpi.getProject()).compileFile(file, buildConfig, fullMMPPath, launcher, monitor);
 
@@ -714,12 +706,6 @@
 		
 		return rules;
 	}
-
-	protected static void runPreBuildChecks(ICarbideBuildConfiguration buildConfig, CarbideCommandLauncher launcher) {
-		if (buildConfig.getPlatformString().toUpperCase().equals(ISBSv1BuildContext.EMULATOR_PLATFORM) && BuilderPreferencePage.useBuiltInX86Vars()) {
-			X86BuildPlugin.checkForUpdates();
-		}
-	}
 	
 	protected static void calculateComponentLists(ICarbideBuildConfiguration buildConfig, CarbideCommandLauncher launcher) {
 		// this could potentially take some time, and this information is needed in a

--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo.java	Thu Sep 16 00:04:43 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo.java	Thu Sep 16 09:07:54 2010 -0500
@@ -44,7 +44,6 @@
 import com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage;
 import com.nokia.carbide.cdt.internal.builder.xml.CarbideBuildConfigurationLoader;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildContext;
-import com.nokia.carbide.cpp.internal.x86build.X86BuildPlugin;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
 
@@ -489,7 +488,7 @@
 	 * @return
 	 */
 	private String getNokiaX86BuildDir(){
-		return X86BuildPlugin.getX86BuildDirectoryPath().toOSString() + File.separator;
+		return CarbideBuilderPlugin.getX86BuildDirectoryPath().toOSString() + File.separator;
 	}
 	
 

--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Thu Sep 16 00:04:43 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Thu Sep 16 09:07:54 2010 -0500
@@ -37,7 +37,6 @@
 import com.nokia.carbide.cdt.internal.builder.ui.BuilderPreferencePage;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildContext;
 import com.nokia.carbide.cpp.internal.api.sdk.SBSv2Utils;
-import com.nokia.carbide.cpp.internal.x86build.X86BuildPlugin;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
 import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
 import com.nokia.cpp.internal.api.utils.core.HostOS;
@@ -456,7 +455,7 @@
 	 * @return
 	 */
 	private String getNokiaX86BuildDir() {
-		return X86BuildPlugin.getX86BuildDirectoryPath().toOSString() + File.separator;
+		return CarbideBuilderPlugin.getX86BuildDirectoryPath().toOSString() + File.separator;
 	}
 	
 	private Map<String, String> stringArrayToMap(String[] array) {