| Index: native_client_sdk/src/tools/common.mk
|
| diff --git a/native_client_sdk/src/tools/common.mk b/native_client_sdk/src/tools/common.mk
|
| index a4e827ad05b00866549b00bc20f42624aa96bd5c..c2ed49452b1f355532f7e5ec9eb1e3bff8649552 100644
|
| --- a/native_client_sdk/src/tools/common.mk
|
| +++ b/native_client_sdk/src/tools/common.mk
|
| @@ -142,7 +142,11 @@ endif
|
| # Disable DOS PATH warning when using Cygwin based NaCl tools on Windows.
|
| #
|
| ifeq ($(OSNAME),win)
|
| - CYGWIN?=nodosfilewarning
|
| + # Always use cmd.exe as the shell on Windows. Otherwise Make may try to
|
| + # search the path for sh.exe. If it is found in a path with a space, the
|
| + # command will fail.
|
| + SHELL := cmd.exe
|
| + CYGWIN ?= nodosfilewarning
|
| export CYGWIN
|
| endif
|
|
|
|
|