Fixes to enable building non-rootless versions too. Untested as it ne…

…eds older Xcode toolchain but it should work as before.
charlie-mtz · Nov 14, 2024 · 0c124a8 · 0c124a8
1 parent 75b3726
commit 0c124a8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,10 @@
-export TARGET = iphone:clang:latest:16.0
-export ARCHS = arm64 arm64e
+ifeq ($(THEOS_PACKAGE_SCHEME),rootless)
+	ARCHS = arm64 arm64e
+	TARGET = iphone:clang:latest:15.0
+else
+	ARCHS = armv7 armv7s arm64 arm64e
+	TARGET = iphone:clang:latest:7.0
+endif
 export DEBUG = 0
 
 THEOS_PACKAGE_DIR_NAME = debs

diff --git a/appinst/Makefile b/appinst/Makefile
@@ -1,5 +1,10 @@
-export TARGET = iphone:clang:latest:16.0
-export ARCHS = arm64 arm64e
+ifeq ($(THEOS_PACKAGE_SCHEME),rootless)
+	ARCHS = arm64 arm64e
+	TARGET = iphone:clang:latest:15.0
+else
+	ARCHS = armv7 armv7s arm64 arm64e
+	TARGET = iphone:clang:latest:7.0
+endif
 export DEBUG = 0
 
 THEOS_PACKAGE_DIR_NAME = debs

diff --git a/asu_inject/Makefile b/asu_inject/Makefile
@@ -1,4 +1,8 @@
-ARCHS = arm64 arm64e
+ifeq ($(THEOS_PACKAGE_SCHEME),rootless)
+	ARCHS = arm64 arm64e
+else
+	ARCHS = armv7 armv7s arm64 arm64e
+endif
 
 include $(THEOS)/makefiles/common.mk
 

diff --git a/pkg-actions/Makefile b/pkg-actions/Makefile
@@ -1,4 +1,8 @@
-ARCHS = arm64 arm64e
+ifeq ($(THEOS_PACKAGE_SCHEME),rootless)
+	ARCHS = arm64 arm64e
+else
+	ARCHS = armv7 armv7s arm64 arm64e
+endif
 
 include $(THEOS)/makefiles/common.mk