summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-03-09 02:51:50 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-03-09 02:51:50 (GMT)
commitca71152213e6ebb10a49ce18714dfd871869ac5a (patch)
treeea34e7425417ff04902edc22b3555abb21f75ae8
parent1305f893642384a3d58926ca79a3a14f1c7652f7 (diff)
downloadSCons-ca71152213e6ebb10a49ce18714dfd871869ac5a.zip
SCons-ca71152213e6ebb10a49ce18714dfd871869ac5a.tar.gz
SCons-ca71152213e6ebb10a49ce18714dfd871869ac5a.tar.bz2
Add msys2 installed mingw64 to PATH for mingw tool
-rwxr-xr-xsrc/CHANGES.txt1
-rw-r--r--src/engine/SCons/Tool/mingw.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 7c5c9c2..760a096 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -27,6 +27,7 @@ From Rob Boehne
characters where it should have been simply replacing existing text. Switched to use string.replace().
- Fix Github Issue #2904 - Provide useful error message when more than one Configure Contexts are opened.
Only one open is allowed. You must call conf.Finish() to complete the currently open one before creating another
+ - Add msys2 installed mingw to PATH for mingw tool.
From Jeremy Elson:
- Updated design doc to use the correct syntax for Depends()
diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py
index e5f472a..d6a27ae 100644
--- a/src/engine/SCons/Tool/mingw.py
+++ b/src/engine/SCons/Tool/mingw.py
@@ -47,6 +47,7 @@ mingw_paths = [
r'c:\MinGW\bin',
r'C:\cygwin64\bin',
r'C:\msys64',
+ r'C:\msys64\mingw64\bin',
r'C:\cygwin\bin',
r'C:\msys',
]