Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
index 82bd52a106..b75bdcfea1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/GnuMakefileGenerator.java
@@ -659,7 +659,7 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
}
// Make sure the build directory is available
- topBuildDir = createDirectory(config.getName());
+ ensureTopBuildDir();
checkCancel();
// Make sure that there is a makefile containing all the folders participating
@@ -792,12 +792,11 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 {
//TODO: fix to use builder output dir instead
String[] configNames = ManagedBuildManager.getBuildInfo(project).getConfigurationNames();
for (String name : configNames) {
- IPath root = new Path(name);
- // It is if it is a root of the resource pathname
- if (root.isPrefixOf(path))
+ IPath pathOfConfig = computeTopBuildDir(name);
+ if (pathOfConfig.isPrefixOf(path)) {
return true;
+ }
}
-
return false;
}

Back to the top