[Lldb-commits] [PATCH] D12909: Fix Makefile for Windows to Android tests.

[Chaoren Lin via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL247857: Fix Makefile for Windows to Android tests. (authored by chaoren).

Changed prior to commit:
  http://reviews.llvm.org/D12909?vs=34905&id=34929#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D12909

Files:
  lldb/trunk/test/make/Makefile.rules

Index: lldb/trunk/test/make/Makefile.rules
===================================================================
--- lldb/trunk/test/make/Makefile.rules
+++ lldb/trunk/test/make/Makefile.rules
@@ -73,11 +73,12 @@
 # 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 @@
 # 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12909.34929.patch
Type: text/x-patch
Size: 1018 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150916/48823d38/attachment.bin>