Merge pull request #4395 from maxbachmann/master-1

MINGW: Add missing directories to searched paths for mingw installs

CHANGES.txt

@@ -9,12 +9,8 @@ NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer suppo
 
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
-  From William Deegan:
-    - The --debug flag now has a 'json' option which will write information
-      generated by --debug={count, memory, time, action-timestamps} and about
-      the build.
-    - Obsoleted YACCVCGFILESUFFIX, being replaced by YACC_GRAPH_FILE_SUFFIX.
-      If YACC_GRAPH_FILE_SUFFIX is not set, it will respect YACCVCGFILESUFFIX.
+  From Max Bachmann:
+    - Add missing directories to searched paths for mingw installs
 
   From Joseph Brill:
     - Fix issue #4312: the cached installed msvc list had an indirect dependency
@@ -43,6 +39,13 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Add arm64 to the MSVS supported architectures list for VS2017 and later to be
       consistent with the current documentation of MSVS_ARCH.
 
+  From William Deegan:
+    - The --debug flag now has a 'json' option which will write information
+      generated by --debug={count, memory, time, action-timestamps} and about
+      the build.
+    - Obsoleted YACCVCGFILESUFFIX, being replaced by YACC_GRAPH_FILE_SUFFIX.
+      If YACC_GRAPH_FILE_SUFFIX is not set, it will respect YACCVCGFILESUFFIX.
+
   From Mats Wichmann
     - C scanner's dictifyCPPDEFINES routine did not understand the possible
       combinations of CPPDEFINES - not aware of a "name=value" string either
@@ -136,7 +139,6 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Fix another instance of `int main()` in CheckLib() causing failures
       when using -Wstrict-prototypes.
 
-
 RELEASE 4.5.2 -  Sun, 21 Mar 2023 14:08:29 -0700
 
   From Michał Górny:

RELEASE.txt

@@ -60,6 +60,7 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY
   architecture combination.  For example, when using VS2022 on arm64, the arm64 native
   tools are only installed for the 14.3x toolsets.
 - Extend range of recognized Java versions to 20.
+- Add missing directories to searched paths for mingw installs
 
 FIXES
 -----

SCons/Platform/mingw.py

@@ -29,5 +29,7 @@
 if sys.platform == 'win32':
     MINGW_DEFAULT_PATHS = [
         r'C:\msys64',
-        r'C:\msys'
+        r'C:\msys64\usr\bin',
+        r'C:\msys',
+        r'C:\msys\usr\bin'
     ]