Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2018-02-02 22:05:30 +0000
committerJeff Johnston2018-02-02 22:34:21 +0000
commit15332e32874dae58abb27af44e69fc2ab2561c9f (patch)
tree2b2ef791155f3fa22fb534456d2edda4e1adb351
parent4322789d6ac9ed32fd6d716ca463ae8107008a5e (diff)
downloadorg.eclipse.cdt-15332e32874dae58abb27af44e69fc2ab2561c9f.tar.gz
org.eclipse.cdt-15332e32874dae58abb27af44e69fc2ab2561c9f.tar.xz
org.eclipse.cdt-15332e32874dae58abb27af44e69fc2ab2561c9f.zip
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
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java4
1 files changed, 3 insertions, 1 deletions
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 a090891c4aa..60218fbdfd8 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
@@ -19,6 +19,7 @@ import java.util.Properties;
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;
@@ -118,7 +119,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

Back to the top