Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Recoskie2008-02-05 19:30:03 +0000
committerChris Recoskie2008-02-05 19:30:03 +0000
commit48c558488704fd8e49dc33149b34a5be1950050b (patch)
treeb53c456165aa680d964b8280ec2dd38b0972d099 /core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal
parent80485fce8a4c7f4d063a1bb113bcf770c51b8f76 (diff)
downloadorg.eclipse.cdt-48c558488704fd8e49dc33149b34a5be1950050b.tar.gz
org.eclipse.cdt-48c558488704fd8e49dc33149b34a5be1950050b.tar.xz
org.eclipse.cdt-48c558488704fd8e49dc33149b34a5be1950050b.zip
some fixes to project description manager and build system to allow EFS hosted projects to function better
Diffstat (limited to 'core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal')
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
index fb972987e51..11f471287c9 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/CdtMacroSupplier.java
@@ -205,7 +205,7 @@ public class CdtMacroSupplier extends CoreMacroSupplierBase {
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,project.getName());
} else if("ProjDirPath".equals(macroName)){ //$NON-NLS-1$
IProject project = getProject(cfg);
- if(project != null)
+ if(project != null && project.getLocation() != null) // in the EFS world getLocation() can return null
macro = new CdtVariable(macroName,ICdtVariable.VALUE_TEXT,project.getLocation().toString());
}
/* else if("BuildArtifactFileName".equals(macroName)){ //$NON-NLS-1$

Back to the top