From 1fd8e82ccf5984ecc74c1f3bb0125bd38f7ed60f Mon Sep 17 00:00:00 2001
From: Chris Recoskie <recoskie@ca.ibm.com>
Date: Wed, 24 Apr 2013 11:32:52 -0400
Subject: [PATCH] Bug 406456 -
 LanguageSettingsScannerInfoProvider.getBuildCWD(ICConfigurationDescription)
 should use EFSExtensionManager

---
 .../providers/LanguageSettingsScannerInfoProvider.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java
index 86748454c45..9e34a363860 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/language/settings/providers/LanguageSettingsScannerInfoProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Andrew Gvozdev and others.
+ * Copyright (c) 2010, 2013 Andrew Gvozdev and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
 
 package org.eclipse.cdt.internal.core.language.settings.providers;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -39,6 +40,7 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 import org.eclipse.cdt.core.settings.model.util.CDataUtil;
 import org.eclipse.cdt.internal.core.settings.model.CProjectDescriptionManager;
 import org.eclipse.cdt.internal.core.settings.model.SettingsModelMessages;
+import org.eclipse.cdt.utils.EFSExtensionManager;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -161,7 +163,9 @@ public class LanguageSettingsScannerInfoProvider implements IScannerInfoProvider
 					buildCWD = new Path(buildPathString);
 				} else {
 					IProject project = cfgDescription.getProjectDescription().getProject();
-					buildCWD = project.getLocation();
+					URI locationURI = project.getLocationURI();
+					String path = EFSExtensionManager.getDefault().getPathFromURI(locationURI);
+					buildCWD = new Path(path);
 				}
 			} catch (CdtVariableException e) {
 				CCorePlugin.log(e);