diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java index 1f87a644260..678986598fe 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuilderFactory.java @@ -274,8 +274,11 @@ public class BuilderFactory { private static IBuilder createBuilder(IConfiguration cfg, Map args){ IToolChain tCh = cfg.getToolChain(); - if(args.get(IBuilder.ID) == null) + boolean isMakeTargetBuild = false; + if(args.get(IBuilder.ID) == null){ args.put(IBuilder.ID, ManagedBuildManager.calculateChildId(cfg.getId(), null)); + isMakeTargetBuild = true; + } MapStorageElement el = new BuildArgsStorageElement(args, null); Builder builder = new Builder(tCh, el, ManagedBuildManager.getVersion().toString()); IBuilder cfgBuilder = cfg.getEditableBuilder(); @@ -290,6 +293,16 @@ public class BuilderFactory { ManagedBuilderCorePlugin.log(e); } } + if(isMakeTargetBuild){ + String [] ids = builder.getCustomizedErrorParserIds(); + if(ids != null && ids.length == 0){ + builder.setCustomizedErrorParserIds(null); + } + + String id = builder.getErrorParserIds(); + if(id == null) + builder.setErrorParserIds(cfgBuilder.getErrorParserIds()); + } return builder; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java index bd332a83b2a..6492181bd4d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/CommonBuilder.java @@ -54,7 +54,6 @@ import org.eclipse.cdt.managedbuilder.internal.buildmodel.DescriptionBuilder; import org.eclipse.cdt.managedbuilder.internal.buildmodel.IBuildModelBuilder; import org.eclipse.cdt.managedbuilder.internal.buildmodel.IConfigurationBuildState; import org.eclipse.cdt.managedbuilder.internal.buildmodel.IProjectBuildState; -import org.eclipse.cdt.managedbuilder.internal.buildmodel.IRebuildState; import org.eclipse.cdt.managedbuilder.internal.buildmodel.ParallelBuilder; import org.eclipse.cdt.managedbuilder.internal.buildmodel.StepBuilder; import org.eclipse.cdt.managedbuilder.macros.BuildMacroException;