Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2013-03-11 16:24:29 +0000
committerAndrew Gvozdev2013-03-11 16:29:22 +0000
commitaed09ee4b8bdf2110254ae1e6e84ebd4a5d8e804 (patch)
tree4ec109998d9a8cc9ebcbaeaadd4b40a3ab051066 /build/org.eclipse.cdt.managedbuilder.gnu.ui/src
parent147e2efc706ef7459d605bca8fe9f7499b07ea91 (diff)
downloadorg.eclipse.cdt-aed09ee4b8bdf2110254ae1e6e84ebd4a5d8e804.tar.gz
org.eclipse.cdt-aed09ee4b8bdf2110254ae1e6e84ebd4a5d8e804.tar.xz
org.eclipse.cdt-aed09ee4b8bdf2110254ae1e6e84ebd4a5d8e804.zip
bug 357442: A bit more of tidy EnvironmentVariableManagerToolChain
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.gnu.ui/src')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java16
1 files changed, 1 insertions, 15 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java
index 21998a342dc..5ef738e1572 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/cygwin/IsGnuCygwinToolChainSupported.java
@@ -12,14 +12,9 @@
package org.eclipse.cdt.managedbuilder.gnu.cygwin;
import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
-import org.eclipse.cdt.core.envvar.IEnvironmentVariableManager;
-import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.internal.core.Cygwin;
-import org.eclipse.cdt.internal.core.envvar.EnvironmentVariableManager;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IManagedIsToolChainSupported;
import org.eclipse.cdt.managedbuilder.core.IToolChain;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.internal.envvar.EnvironmentVariableManagerToolChain;
import org.osgi.framework.Version;
@@ -33,16 +28,7 @@ public class IsGnuCygwinToolChainSupported implements IManagedIsToolChainSupport
@Override
public boolean isSupported(IToolChain toolChain, Version version, String instance) {
- IConfiguration cfg = toolChain.getParent();
- ICConfigurationDescription cfgDescription = cfg != null ? ManagedBuildManager.getDescriptionForConfiguration(cfg) : null;
-
- IEnvironmentVariableManager envMngr;
- if (cfgDescription != null) {
- envMngr = EnvironmentVariableManager.getDefault();
- } else {
- envMngr = new EnvironmentVariableManagerToolChain(toolChain);
- }
- IEnvironmentVariable var = envMngr.getVariable(ENV_PATH, cfgDescription, true);
+ IEnvironmentVariable var = new EnvironmentVariableManagerToolChain(toolChain).getVariable(ENV_PATH, true);
String envPath = var != null ? var.getValue() : null;
return Cygwin.isAvailable(envPath);
}

Back to the top