diff options
Diffstat (limited to 'build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java')
-rw-r--r-- | build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java index 1b12ceeb1d3..64c34e34c2d 100644 --- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java +++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakefileBuildConfigurationProvider.java @@ -95,12 +95,16 @@ public class MakefileBuildConfigurationProvider implements ICBuildConfigurationP } } String name = configName.toString(); - int i = 0; - while (configManager.hasConfiguration(this, project, name)) { - name = configName.toString() + '.' + (++i); + IBuildConfiguration config = null; + // reuse any IBuildConfiguration with the same name for the project + // so adding the CBuildConfiguration will override the old one stored + // by the CBuildConfigurationManager + if (configManager.hasConfiguration(this, project, name)) { + config = project.getBuildConfig(this.getId() + '/' + name); + } + if (config == null) { + config = configManager.createBuildConfiguration(this, project, name, monitor); } - - IBuildConfiguration config = configManager.createBuildConfiguration(this, project, name, monitor); StandardBuildConfiguration makeConfig = new StandardBuildConfiguration(config, name, toolChain, launchMode); configManager.addBuildConfiguration(config, makeConfig); return makeConfig; |