From d761a9532bc6d2cd04e6d75a5cfc1c0a76fa8864 Mon Sep 17 00:00:00 2001
From: Chaoren Lin <chaorenl@google.com>
Date: Wed, 16 Sep 2015 21:51:51 +0000
Subject: [PATCH] Fix Makefile for Windows to Android tests.

Reviewers: zturner

Subscribers: tberghammer, lldb-commits, danalbert

Differential Revision: http://reviews.llvm.org/D12909

llvm-svn: 247857
---
 lldb/test/make/Makefile.rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lldb/test/make/Makefile.rules b/lldb/test/make/Makefile.rules
index a73ab3f3e0fe..d5d7fa6859ab 100644
--- a/lldb/test/make/Makefile.rules
+++ b/lldb/test/make/Makefile.rules
@@ -73,11 +73,12 @@ endif
 # tests from Visual Studio, the environment variable isn't inherited
 # all the way down to the process spawned for make.
 #----------------------------------------------------------------------
-ifeq "$(OS)" ""
-	OS = $(shell uname -s)
+HOST_OS = $(shell uname -s)
+ifeq "$(HOST_OS)" "windows32"
+	HOST_OS = Windows_NT
 endif
-ifeq "$(OS)" "windows32"
-	OS = Windows_NT
+ifeq "$(OS)" ""
+	OS = $(HOST_OS)
 endif
 
 #----------------------------------------------------------------------
@@ -485,7 +486,7 @@ endif
 # the compiler -MM option. The -M option will list all system headers,
 # and the -MM option will list all non-system dependencies.
 #----------------------------------------------------------------------
-ifeq "$(OS)" "Windows_NT"
+ifeq "$(HOST_OS)" "Windows_NT"
 	JOIN_CMD = &
 	QUOTE = "
 else