From 5cc7de09ef983cc2741a3ba011170278b8994cbe Mon Sep 17 00:00:00 2001 From: Nathan Lanza Date: Thu, 15 Nov 2018 20:56:44 +0000 Subject: Force SHELL to be cmd.exe on Windows for the test suite 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 --- lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lldb/packages/Python/lldbsuite/test/make/Makefile.rules') diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 2bfd1f7321b..1a36010cac4 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -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 -- cgit v1.2.3