diff options
| -rw-r--r-- | lldb/test/make/Makefile.rules | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lldb/test/make/Makefile.rules b/lldb/test/make/Makefile.rules index a73ab3f3e0f..d5d7fa6859a 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 |
