5 files changed, 12 insertions, 6 deletions
diff --git a/tools/buildsteps/ios/make-xbmc b/tools/buildsteps/ios/make-xbmc
index 752cb23257..167fd7a0e6 100755
--- a/tools/buildsteps/ios/make-xbmc
+++ b/tools/buildsteps/ios/make-xbmc
@@ -2,4 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=ios
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE/build;xcodebuild -configuration $Configuration build -jobs $BUILDTHREADS
+cd $WORKSPACE/build;xcodebuild -configuration $Configuration build -jobs $BUILDTHREADS \
+  SDKROOT=iphoneos$SDK_VERSION XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT \
+  CODE_SIGNING_ALLOWED="NO"
diff --git a/tools/buildsteps/ios/package b/tools/buildsteps/ios/package
index 72feea0453..336f0603b2 100755
--- a/tools/buildsteps/ios/package
+++ b/tools/buildsteps/ios/package
@@ -2,7 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=ios
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE/build;xcodebuild -target deb -jobs $BUILDTHREADS
+cd $WORKSPACE/build;xcodebuild -target deb -jobs $BUILDTHREADS \
+  CODE_SIGNING_ALLOWED="NO"
 cd $WORKSPACE/build/tools/darwin/packaging/darwin_embedded/
 
 #rename for upload
diff --git a/tools/buildsteps/tvos/make-xbmc b/tools/buildsteps/tvos/make-xbmc
index f43679c24a..d7b401c160 100755
--- a/tools/buildsteps/tvos/make-xbmc
+++ b/tools/buildsteps/tvos/make-xbmc
@@ -2,6 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=tvos
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE/build;xcodebuild -configuration $Configuration build \
+cd $WORKSPACE/build;xcodebuild -configuration $Configuration build -jobs $BUILDTHREADS \
   SDKROOT=appletvos$SDK_VERSION XBMC_DEPENDS_ROOT=$XBMC_DEPENDS_ROOT \
-  CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" -CODE_SIGNING_ALLOWED="NO"
+  CODE_SIGNING_ALLOWED="NO"
diff --git a/tools/buildsteps/tvos/package b/tools/buildsteps/tvos/package
index 8774eb130a..8a088a8f27 100755
--- a/tools/buildsteps/tvos/package
+++ b/tools/buildsteps/tvos/package
@@ -2,7 +2,8 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=tvos
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE/build;xcodebuild -target deb
+cd $WORKSPACE/build;xcodebuild -target deb \
+  CODE_SIGNING_ALLOWED="NO"
 cd $WORKSPACE/build/tools/darwin/packaging/darwin_embedded/
 
 #rename for upload
diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile
index 934d1ad9d1..fa35ca9146 100644
--- a/tools/depends/target/cmakebuildsys/Makefile
+++ b/tools/depends/target/cmakebuildsys/Makefile
@@ -14,8 +14,10 @@ ifeq ($(OS),darwin_embedded)
   # cmake toolset option buildsystem selects the legacy xcode build system
   # cmake 3.19+ with xcode 12 defaults to the new build system. Stick with the legacy
   # system for now for our building
-  CMAKE_BUILD_ARGUMENTS = -G Xcode -T buildsystem=1
+  CMAKE_BUILD_ARGUMENTS = -G Xcode
 else ifeq ($(GEN),Xcode)
+  CMAKE_BUILD_ARGUMENTS = -G Xcode
+else ifeq ($(GEN),Xcodelegacy)
   CMAKE_BUILD_ARGUMENTS = -G Xcode -T buildsystem=1
 else ifeq ($(GEN),Ninja)
   CMAKE_BUILD_ARGUMENTS = -G "Ninja" -DCMAKE_BUILD_TYPE=$(Configuration)