Skip to main content
summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAndrew Gvozdev2012-07-09 23:00:50 -0400
committerAndrew Gvozdev2012-07-09 23:34:52 -0400
commitce51475dc5971e6d30e7a1265c73c534dac48af6 (patch)
tree585ac8f8149f1a2bcf14ff9d0e93711d4ce6aaa6 /build
parent09fed04601b2e6024d8eba168f8f5fb0d87dd111 (diff)
downloadorg.eclipse.cdt-ce51475dc5971e6d30e7a1265c73c534dac48af6.tar.gz
org.eclipse.cdt-ce51475dc5971e6d30e7a1265c73c534dac48af6.tar.xz
org.eclipse.cdt-ce51475dc5971e6d30e7a1265c73c534dac48af6.zip
bug 380598: MinGW 64bit toolchain not detected.
Diffstat (limited to 'build')
-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 79fb3eadc9..c5dcb3c01a 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