Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gvozdev2012-07-10 03:00:50 +0000
committerAndrew Gvozdev2012-07-10 03:36:43 +0000
commit040b82128a5e452bbfd52f707549a7eea1fa7324 (patch)
tree90091368db247b356597fbfb0096254cacebe42d /build/org.eclipse.cdt.managedbuilder.gnu.ui/src
parentee27356ecf18959a857fb0aeb3f964e8000a566d (diff)
downloadorg.eclipse.cdt-040b82128a5e452bbfd52f707549a7eea1fa7324.tar.gz
org.eclipse.cdt-040b82128a5e452bbfd52f707549a7eea1fa7324.tar.xz
org.eclipse.cdt-040b82128a5e452bbfd52f707549a7eea1fa7324.zip
bug 380598: MinGW 64bit toolchain not detected.
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/mingw/MingwEnvironmentVariableSupplier.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
index 79fb3eadc96..c5dcb3c01a0 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/mingw/MingwEnvironmentVariableSupplier.java
@@ -127,6 +127,14 @@ public class MingwEnvironmentVariableSupplier implements IConfigurationEnvironme
return mingwBinDir;
}
+ // Check for MinGW-w64 on Windows 64 bit, see http://mingw-w64.sourceforge.net/
+ if (Platform.ARCH_X86_64.equals(Platform.getOSArch())) {
+ IPath gcc64Loc = PathUtil.findProgramLocation("x86_64-w64-mingw32-gcc.exe", envPathValueCached); //$NON-NLS-1$
+ if (gcc64Loc != null) {
+ return gcc64Loc.removeLastSegments(1);
+ }
+ }
+
// Look in PATH values. Look for mingw32-gcc.exe
// TODO: Since this dir is already in the PATH, why are we adding it here?
// This is really only to support isToolchainAvail. Must be a better way.

Back to the top