aprantl updated this revision to Diff 271877. aprantl marked an inline comment as done. aprantl added a comment.
Simplify version detection. CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81980/new/ https://reviews.llvm.org/D81980 Files: lldb/packages/Python/lldbsuite/test/make/Makefile.rules Index: lldb/packages/Python/lldbsuite/test/make/Makefile.rules =================================================================== --- lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -140,7 +140,10 @@ SDKROOT := $(shell xcrun --sdk $(SDK_NAME) --show-sdk-path) endif ifeq "$(TRIPLE_VERSION)" "" - TRIPLE_VERSION := $(shell echo $(notdir $(SDKROOT)) | grep -E -o -e '[0-9]+\.[0-9]') + ifeq "$(SDK_NAME)" "" + $(error "SDK_NAME is empty") + endif + TRIPLE_VERSION := $(shell xcrun --sdk $(SDK_NAME) --show-sdk-version) endif ifeq "$(TRIPLE_ENV)" "simulator" ARCH_CFLAGS := -m$(TRIPLE_OS)-simulator-version-min=$(TRIPLE_VERSION)
Index: lldb/packages/Python/lldbsuite/test/make/Makefile.rules =================================================================== --- lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -140,7 +140,10 @@ SDKROOT := $(shell xcrun --sdk $(SDK_NAME) --show-sdk-path) endif ifeq "$(TRIPLE_VERSION)" "" - TRIPLE_VERSION := $(shell echo $(notdir $(SDKROOT)) | grep -E -o -e '[0-9]+\.[0-9]') + ifeq "$(SDK_NAME)" "" + $(error "SDK_NAME is empty") + endif + TRIPLE_VERSION := $(shell xcrun --sdk $(SDK_NAME) --show-sdk-version) endif ifeq "$(TRIPLE_ENV)" "simulator" ARCH_CFLAGS := -m$(TRIPLE_OS)-simulator-version-min=$(TRIPLE_VERSION)
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
