Skip to content

Commit

Permalink
Force SHELL to be cmd.exe on Windows for the test suite
Browse files Browse the repository at this point in the history
Summary:
Windows make will search for other shells and choose those over cmd
if available (e.g. C:\cygdrive\bin\sh.exe). This shell has numerous
issues with path handling (/ vs \\ vs \ and C:). So default to using
cmd.exe which is known to work.

Reviewers: zturner, sas, xiaobai

Reviewed By: zturner

Differential Revision: https://reviews.llvm.org/D54510

llvm-svn: 346993
  • Loading branch information
lanza committed Nov 15, 2018
1 parent 8d5a36a commit 5cc7de0
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions lldb/packages/Python/lldbsuite/test/make/Makefile.rules
Expand Up @@ -50,6 +50,17 @@ ifeq "$(OS)" ""
OS = $(HOST_OS)
endif

#----------------------------------------------------------------------
# If OS is Windows, force SHELL to be cmd
#
# Some versions of make on Windows will search for other shells such as
# C:\cygwin\bin\sh.exe. This shell fails for numerous different reasons
# so default to using cmd.exe.
#----------------------------------------------------------------------
ifeq "$(OS)" "Windows_NT"
SHELL = $(WINDIR)\system32\cmd.exe
endif

#----------------------------------------------------------------------
# If TRIPLE is not defined try to set the ARCH, CC, CFLAGS, and more
# from the triple alone
Expand Down

0 comments on commit 5cc7de0

Please sign in to comment.