From e8f619c3447ea7f47df74680660151fb07da3c4a Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Fri, 2 Feb 2018 17:05:30 -0500 Subject: [PATCH] Bug 529121 - "Build target" has stopped working in CDT 9.4.0 - default environment using EnvironmentReader in CommandLauncherWrapper class in CommandLauncherManager if no environment set for wrapper to match behaviour of CommandLauncher Change-Id: I71ff37b3d8f2049dc705e97bf28f939ac78bd390 --- .../src/org/eclipse/cdt/core/CommandLauncherManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java index 6b87ed66501..e9e6a4f4fb9 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java @@ -20,6 +20,7 @@ import java.util.Properties; import org.eclipse.cdt.core.build.ICBuildConfiguration; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICLanguageSettingEntry; +import org.eclipse.cdt.utils.spawner.EnvironmentReader; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; @@ -119,7 +120,8 @@ public class CommandLauncherManager { if (launcher != null) { return launcher.getEnvironment(); } - return null; + // for backwards compatibility to ensure path is set up + return EnvironmentReader.getEnvVars(); } @Override