Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Prigogin2011-05-25 03:55:35 +0000
committerSergey Prigogin2011-05-25 03:55:35 +0000
commit6eea032c76fe84c6954acd8ea72caddd1c1903a1 (patch)
tree256a24e30ef098861dd7dada58732e98449eb952 /build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder
parente9eeb2b478a4ece381e9f4c6b65f148624582147 (diff)
downloadorg.eclipse.cdt-6eea032c76fe84c6954acd8ea72caddd1c1903a1.tar.gz
org.eclipse.cdt-6eea032c76fe84c6954acd8ea72caddd1c1903a1.tar.xz
org.eclipse.cdt-6eea032c76fe84c6954acd8ea72caddd1c1903a1.zip
Include directories starting with ${workspace_loc} should be treated as filesystem ones, not workspace ones.
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
index 5f62c542e01..b7b385186ef 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
@@ -590,12 +590,14 @@ public class BuildEntryStorage extends AbstractEntryStorage {
private static PathInfo optionPathValueToEntry(String str, SupplierBasedCdtVariableSubstitutor subst) {
String unresolvedStr = ManagedBuildManager.locationToFullPath(str);
- boolean isWorkspacePath;
- if (unresolvedStr != null) {
- isWorkspacePath = true;
- } else {
+ boolean isWorkspacePath = false;
+ if (unresolvedStr == null) {
unresolvedStr = str;
- isWorkspacePath = false;
+ } else {
+ // A path starting from "${workspace_loc}" is always a filesystem path.
+ if (!unresolvedStr.startsWith("${workspace_loc}")) { //$NON-NLS-1$
+ isWorkspacePath = true;
+ }
}
return new PathInfo(unresolvedStr, isWorkspacePath, subst);
}

Back to the top