From 0f47c669c119ea8740f90bee446291abfd1ece2e Mon Sep 17 00:00:00 2001 From: John Dallaway Date: Wed, 7 May 2025 15:43:20 +0100 Subject: [PATCH] Improve MinGW detection for toolchain availability filtering Use the same logic to locate a MinGW toolchain when filtering toolchains for selection in the project wizard as we do during project build. --- .../utils/org/eclipse/cdt/internal/core/MinGW.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/MinGW.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/MinGW.java index 674c245e503..6455314771b 100644 --- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/MinGW.java +++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/internal/core/MinGW.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2012, 2024 Andrew Gvozdev and others. + * Copyright (c) 2012, 2025 Andrew Gvozdev and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -371,7 +371,7 @@ public class MinGW { } /** - * Check if MinGW is available in the path. + * Check if MinGW is available in the specified path or via known installation hints. * * @param envPath * - list of directories to search for MinGW separated by path @@ -380,7 +380,7 @@ public class MinGW { * @return {@code true} if MinGW is available, {@code false} otherwise. */ public static boolean isAvailable(String envPath) { - return isWindowsPlatform && findMingwInPath(envPath) != null; + return isWindowsPlatform && findMinGWRoot(envPath, null) != null; } /**