Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix msys ORIGINAL_PATH confusion #16269

Merged
merged 2 commits into from
Jun 2, 2024
Merged

Fix msys ORIGINAL_PATH confusion #16269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c0c7e8
Fix msys ORIGINAL_PATH confusion
paulharris May 16, 2024
408b291
unset env ORIGINAL_PATH, so Conan's PATH will be used in msys
paulharris Jun 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions conans/client/subsystems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def _windows_bash_wrapper(conanfile, command, env, envfiles_folder):
# - CHERE_INVOKING is necessary to keep the CWD and not change automatically to the user home
msys2_mode_env.define("MSYSTEM", _msystem)
msys2_mode_env.define("MSYS2_PATH_TYPE", "inherit")
msys2_mode_env.unset("ORIGINAL_PATH")
# So --login do not change automatically to the user home
msys2_mode_env.define("CHERE_INVOKING", "1")
path = os.path.join(conanfile.generators_folder, "msys2_mode.bat")
Expand Down