From cf00e4b27e1a6ff855bb832143f6e9b38a25470c Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Wed, 12 Jan 2022 15:39:17 -0500 Subject: [PATCH] Bug 578187: Don't discard make arguments If a user set the make arguments manually to what the automatic arguments would have been if enabled, they would be discarded. This change does not do that bit of magic anymore because the user now (since Bug 568397) edits the build command and arguments separately so less magic needs to happen in the code. This is a follow-up to Bug 568397. Change-Id: Ie8f51cbb86133fc4a9506913743613712e93d881 --- .../META-INF/MANIFEST.MF | 2 +- .../cdt/managedbuilder/internal/core/Builder.java | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF index 42f24c079f3..481dcdedf76 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.managedbuilder.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.managedbuilder.core; singleton:=true -Bundle-Version: 9.3.200.qualifier +Bundle-Version: 9.3.300.qualifier Bundle-Activator: org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java index dbca2198186..f3da4f8db5d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java @@ -1295,16 +1295,6 @@ public class Builder extends HoldsOptions implements IBuilder, IMatchKeyProvider @Override public void setArguments(String newArgs) { - if (getArguments().equals(newArgs)) - return; - - if (newArgs != null) { - String stopOnErrCmd = getStopOnErrCmd(isStopOnError()); - String parallelCmd = isParallelBuildOn() ? getParallelizationCmd(getParallelizationNum()) : EMPTY_STRING; - - newArgs = removeCmd(newArgs, stopOnErrCmd); - newArgs = removeCmd(newArgs, parallelCmd); - } setArgumentsAttribute(newArgs); }