[LLDB][test] Improve SHELL detection on Windows in Makefile.rules #99532
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dzhidzhoev
requested review from
rupprecht,
DavidSpickett,
labath,
lanza and
jimingham
|
@llvm/pr-subscribers-lldb Author: Vladislav Dzhidzhoev (dzhidzhoev) ChangesSince Windows 10 the case of 'windir' env variable was changed. Such error appears without that change: Full diff: https://github.com/llvm/llvm-project/pull/99532.diff 1 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 3d562285ce9cc..4ade8c16b8e6f 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -80,8 +80,9 @@ endif
# 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"
+ # Windows 10 and later has the lower-case 'windir' env variable.
+ SHELL := $(or $(windir),$(WINDIR),C:\WINDOWS)\system32\cmd.exe
BUILDDIR := $(shell echo %cd%)
endif
|
In MinGW make, %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 in upper case. This commit makes Makefile.rules consider both run variants.
dzhidzhoev
force-pushed
the
lldb/win-shell-detection
branch
from
3ed6eec to
17f92b9
Compare
dzhidzhoev
changed the title
|
Sorry, the initial issue this commit resolves was identified wrongly, fixed the commit description. |
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
…9532) Summary: 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. Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60251450
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.