diff options
| author | Nathan Lanza <nathan@lanza.io> | 2018-11-15 20:56:44 +0000 |
|---|---|---|
| committer | Nathan Lanza <nathan@lanza.io> | 2018-11-15 20:56:44 +0000 |
| commit | 5cc7de09ef983cc2741a3ba011170278b8994cbe (patch) | |
| tree | 3a015ff52c492451331b0b1c148f11a12bc05f7b /lldb/packages/Python/lldbsuite/test | |
| parent | 8d5a36a8394ca7774672642f713b6258d59940d2 (diff) | |
| download | bcm5719-llvm-5cc7de09ef983cc2741a3ba011170278b8994cbe.tar.gz bcm5719-llvm-5cc7de09ef983cc2741a3ba011170278b8994cbe.zip | |
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
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 11 |
1 files changed, 11 insertions, 0 deletions
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 @@ -51,6 +51,17 @@ ifeq "$(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 #---------------------------------------------------------------------- |
