diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-03-15 19:35:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-15 19:35:35 (GMT) |
| commit | 1b72deefc6d327ed821cd9742563591fa0201c69 (patch) | |
| tree | 40e1aac80ef18796243efdfabd4ce9285c3dc820 | |
| parent | 0790980945e22c6f51a8d6959a86063d8a99f1ce (diff) | |
| parent | 75be26112bf6d4ab42b1367997785a7bbd192577 (diff) | |
| download | SCons-1b72deefc6d327ed821cd9742563591fa0201c69.zip SCons-1b72deefc6d327ed821cd9742563591fa0201c69.tar.gz SCons-1b72deefc6d327ed821cd9742563591fa0201c69.tar.bz2 | |
Merge pull request #3577 from bdbaddog/add_msys2_mingw_paths
Add msys2 installed mingw64 to PATH for mingw tool
| -rwxr-xr-x | src/CHANGES.txt | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mingw.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7c5c9c2..6e42ccf 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -27,6 +27,8 @@ 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 default path to PATH for mingw tool. + - C:\msys64\mingw64\bin 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', ] |