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
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
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
