From 243af2ff217f65ef291232faa60779b86e01a967 Mon Sep 17 00:00:00 2001 From: Vladislav Dzhidzhoev Date: Fri, 19 Jul 2024 13:08:07 +0200 Subject: [PATCH] [LLDB][test] Improve SHELL detection on Windows in Makefile.rules (#99532) In MinGW make, the `%windir%` variable has a lowercase name `$(windir)` when launched from cmd.exe, and `$(WINDIR)` name when launched from MSYS2, since MSYS2 represents standard Windows environment variables names in upper case. This commit makes Makefile.rules consider both run variants. --- lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 597aa94566c2..be3ad684dd73 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -55,8 +55,10 @@ LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../ # Also reset BUILDDIR value because "pwd" returns cygwin or msys path # which needs to be converted to windows path. #---------------------------------------------------------------------- -ifeq "$(OS)" "Windows_NT" - SHELL = $(WINDIR)\system32\cmd.exe +ifeq "$(HOST_OS)" "Windows_NT" + # MinGW make gets $(windir) variable if launched from cmd.exe + # and $(WINDIR) if launched from MSYS2. + SHELL := $(or $(windir),$(WINDIR),C:\WINDOWS)\system32\cmd.exe BUILDDIR := $(shell echo %cd%) endif