diff options
| author | Adrian Prantl <aprantl@apple.com> | 2019-09-04 17:23:15 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2019-09-04 17:23:15 +0000 |
| commit | 2461061168f4ac4ca8a1823768a00d1c63355b1b (patch) | |
| tree | 4e38a76bbb1f43efde95d83428162d3cafeb3469 /lldb/packages/Python/lldbsuite/test/make | |
| parent | 40fe351cf699eda8d7d9a72c7bbbb37cef7f3164 (diff) | |
| download | bcm5719-llvm-2461061168f4ac4ca8a1823768a00d1c63355b1b.tar.gz bcm5719-llvm-2461061168f4ac4ca8a1823768a00d1c63355b1b.zip | |
Upstream macCatalyst support in debugserver and the macOS dynamic loader
plugin.
Unfortunately the test is currently XFAILed because of missing changes
to the clang driver.
Differential Revision: https://reviews.llvm.org/D67124
llvm-svn: 370931
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index ecfed7efc53..784307b98ac 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -88,6 +88,7 @@ ifneq "$(TRIPLE)" "" triple_os_and_version =$(shell echo $(word 3, $(triple_space)) | sed 's/\([a-z]*\)\(.*\)/\1 \2/') TRIPLE_OS =$(word 1, $(triple_os_and_version)) TRIPLE_VERSION =$(word 2, $(triple_os_and_version)) + TRIPLE_ENV =$(word 4, $(triple_space)) ifeq "$(TRIPLE_VENDOR)" "apple" ifeq "$(TRIPLE_OS)" "ios" CODESIGN := codesign @@ -100,11 +101,19 @@ ifneq "$(TRIPLE)" "" endif ARCH_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" else - SDKROOT = $(shell xcrun --sdk iphonesimulator --show-sdk-path) + ifeq "$(TRIPLE_ENV)" "macabi" + SDKROOT = $(shell xcrun --sdk macosx --show-sdk-path) + else + SDKROOT = $(shell xcrun --sdk iphonesimulator --show-sdk-path) + endif ifeq "$(TRIPLE_VERSION)" "" TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/') endif - ARCH_CFLAGS :=-mios-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + ifeq "$(TRIPLE_ENV)" "macabi" + ARCH_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + else + ARCH_CFLAGS :=-mios-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)" + endif endif endif endif |
