diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index 77e343826f5b..2bfd1f7321bb 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -64,6 +64,7 @@ ifneq "$(TRIPLE)" ""
 	TRIPLE_VERSION =$(word 2, $(triple_os_and_version))
 	ifeq "$(TRIPLE_VENDOR)" "apple"
 		ifeq "$(TRIPLE_OS)" "ios"
+		    CODESIGN := codesign
 		    ifeq "$(SDKROOT)" ""
 				# Set SDKROOT if it wasn't set
 				ifneq (,$(findstring arm,$(ARCH)))
@@ -82,7 +83,8 @@ ifneq "$(TRIPLE)" ""
 			endif
 		endif
 		ifeq "$(TRIPLE_OS)" "watchos"
-		    ifeq "$(SDKROOT)" ""
+			CODESIGN := codesign
+			ifeq "$(SDKROOT)" ""
 				# Set SDKROOT if it wasn't set
 				ifneq (,$(findstring arm,$(ARCH)))
 					SDKROOT = $(shell xcrun --sdk watchos --show-sdk-path)
@@ -153,7 +155,6 @@ ifeq "$(OS)" "Darwin"
 	DSYM = $(EXE).dSYM
 	AR := $(CROSS_COMPILE)libtool
 	ARFLAGS := -static -o
-	CODESIGN = codesign
 else
 	AR := $(CROSS_COMPILE)ar
 	# On non-Apple platforms, -arch becomes -m