Skip to content

Commit cc91eff

Browse files
author
Kevin Frei
committed
Reapply "DebugInfoD tests + fixing issues exposed by tests (llvm#85693)"
This reverts commit 7fc2fbb.
1 parent 6f8d278 commit cc91eff

File tree

1 file changed

+25
-1
lines changed

1 file changed

+25
-1
lines changed

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,31 @@ LLDB_BASE_DIR := $(THIS_FILE_DIR)/../../../../../
4646
# according to variable values).
4747
.DEFAULT_GOAL := all
4848

49+
#----------------------------------------------------------------------
50+
# If OS is not defined, use 'uname -s' to determine the OS name.
51+
#
52+
# GNUWin32 uname gives "windows32" or "server version windows32" while
53+
# some versions of MSYS uname return "MSYS_NT*", but most environments
54+
# standardize on "Windows_NT", so we'll make it consistent here.
55+
# When running tests from Visual Studio, the environment variable isn't
56+
# inherited all the way down to the process spawned for make.
57+
#----------------------------------------------------------------------
58+
ifeq "$(HOST_OS)" ""
59+
HOST_OS := $(shell uname -s)
60+
endif
61+
62+
ifneq (,$(findstring windows32,$(HOST_OS)))
63+
HOST_OS := Windows_NT
64+
endif
65+
66+
ifneq (,$(findstring MSYS_NT,$(HOST_OS)))
67+
HOST_OS := Windows_NT
68+
endif
69+
70+
ifeq "$(OS)" ""
71+
OS := $(HOST_OS)
72+
endif
73+
4974
#----------------------------------------------------------------------
5075
# If OS is Windows, force SHELL to be cmd
5176
#
@@ -596,7 +621,6 @@ ifeq "$(MAKE_DWP)" "YES"
596621
endif
597622
endif
598623

599-
600624
#----------------------------------------------------------------------
601625
# Make the dylib
602626
#----------------------------------------------------------------------

0 commit comments

Comments
 (0)