diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-28 14:42:54 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-28 14:42:54 +0200 |
| commit | 3cefe898b15375226b0b3c2e64140614bb3af97d (patch) | |
| tree | dab3e70cfbefb589793b59262dbe883500ee78c1 | |
| parent | 6f8b90e41213e8674ddcdb715ac4eef712dc4842 (diff) | |
| parent | 63911b994c5ba7963d6673e59e7cd77efbb15147 (diff) | |
| download | redot-engine-3cefe898b15375226b0b3c2e64140614bb3af97d.tar.gz | |
Merge pull request #93589 from mhilbrunner/fix-windows-vs-arch-detection
Windows: Fix arch detection via `VCTOOLSINSTALLDIR` if not first in `PATH`
| -rw-r--r-- | platform/windows/detect.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 0ad84240e4..8e1abba3bb 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -142,8 +142,9 @@ def detect_build_env_arch(): if os.getenv("VCTOOLSINSTALLDIR"): host_path_index = os.getenv("PATH").upper().find(os.getenv("VCTOOLSINSTALLDIR").upper() + "BIN\\HOST") if host_path_index > -1: - first_path_arch = os.getenv("PATH").split(";")[0].rsplit("\\", 1)[-1].lower() - return msvc_target_aliases[first_path_arch] + first_path_arch = os.getenv("PATH")[host_path_index:].split(";")[0].rsplit("\\", 1)[-1].lower() + if first_path_arch in msvc_target_aliases.keys(): + return msvc_target_aliases[first_path_arch] msys_target_aliases = { "mingw32": "x86_32", |