Author: chaoren Date: Wed Sep 16 16:51:51 2015 New Revision: 247857 URL: http://llvm.org/viewvc/llvm-project?rev=247857&view=rev Log: Fix Makefile for Windows to Android tests.
Reviewers: zturner Subscribers: tberghammer, lldb-commits, danalbert Differential Revision: http://reviews.llvm.org/D12909 Modified: lldb/trunk/test/make/Makefile.rules Modified: lldb/trunk/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=247857&r1=247856&r2=247857&view=diff ============================================================================== --- lldb/trunk/test/make/Makefile.rules (original) +++ lldb/trunk/test/make/Makefile.rules Wed Sep 16 16:51:51 2015 @@ -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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
