diff --git a/app-ios/info-app.plist.in b/app-ios/info-app.plist.in
index b950a2dc0..6fa9d7b71 100644
--- a/app-ios/info-app.plist.in
+++ b/app-ios/info-app.plist.in
@@ -22,28 +22,29 @@
@REVISION@
BuildMachineOSBuild
- 18E226
+ 23D56
CFBundleDevelopmentRegion
en
- DTCompiler
- com.apple.compilers.llvm.clang.1_0
DTPlatformName
iphoneos
+
+ DTCompiler
+ com.apple.compilers.llvm.clang.1_0
DTPlatformVersion
- 15.2
+ 17.0
DTPlatformBuild
- 19C51
+ 21A326
DTSDKBuild
- 19C51
+ 21A326
DTSDKName
- iphoneos15.2
+ iphoneos17.0
DTXcode
- 1320
+ 1501
DTXcodeBuild
- 13C100
+ 15A507
DTAppStoreToolsBuild
- 13E500
+ 15E204
LSApplicationCategoryType
public.app-category.utilities
@@ -59,7 +60,7 @@
11
MinimumOSVersion
- 11.0
+ 12.0
CFBundleSupportedPlatforms
diff --git a/app-ios/info-vpn.plist.in b/app-ios/info-vpn.plist.in
index d86871f7c..030bf1b2c 100644
--- a/app-ios/info-vpn.plist.in
+++ b/app-ios/info-vpn.plist.in
@@ -24,28 +24,29 @@
@REVISION@
BuildMachineOSBuild
- 18E226
+ 23D56
CFBundleDevelopmentRegion
en
- DTCompiler
- com.apple.compilers.llvm.clang.1_0
DTPlatformName
iphoneos
+
+ DTCompiler
+ com.apple.compilers.llvm.clang.1_0
DTPlatformVersion
- 15.2
+ 17.0
DTPlatformBuild
- 19C51
+ 21A326
DTSDKBuild
- 19C51
+ 21A326
DTSDKName
- iphoneos15.2
+ iphoneos17.0
DTXcode
- 1320
+ 1501
DTXcodeBuild
- 13C100
+ 15A507
DTAppStoreToolsBuild
- 13E500
+ 15E204
LSApplicationCategoryType
public.app-category.utilities
@@ -67,7 +68,7 @@
11
MinimumOSVersion
- 11.0
+ 12.0
CFBundleSupportedPlatforms
diff --git a/env/output.mk b/env/output.mk
index 5bbd01c49..9b59f33e2 100644
--- a/env/output.mk
+++ b/env/output.mk
@@ -136,7 +136,7 @@ $(output)/%/build.ninja: $$(specific) $$(folder)/meson.build $(output)/$$(arch)/
$(specific)
@rm -rf $(dir $@)
@mkdir -p $(dir $@)
- cd $(dir $<) && ENV_ARCH="$(arch)" $(unshare) meson --cross-file $(CURDIR)/$(output)/$(arch)/meson.txt $(CURDIR)/$(dir $@) \
+ cd $(dir $<) && ENV_ARCH="$(arch)" $(unshare) meson setup --cross-file $(CURDIR)/$(output)/$(arch)/meson.txt $(CURDIR)/$(dir $@) \
-Ddefault_library=static $(w_$(subst -,_,$(notdir $(patsubst %/meson.build,%,$<))))
cd $(dir $@); $(m_$(subst -,_,$(notdir $(patsubst %/meson.build,%,$<))))
diff --git a/env/target-apl.mk b/env/target-apl.mk
index ef06781c1..1bc314fd8 100644
--- a/env/target-apl.mk
+++ b/env/target-apl.mk
@@ -18,7 +18,6 @@ meson := darwin
lflags += -Wl,-ObjC
lflags += -Wl,-dead_strip
-lflags += -Wl,-no_dead_strip_inits_and_terms
# libtool
qflags += -DPIC
@@ -59,12 +58,11 @@ more += -fno-strict-return
include $(pwd)/kit-android.mk
cxx += -stdlib=libc++
-# the r22 NDK prefers its own copy of ld
-wflags += -fuse-ld=/usr/bin/ld
+include $(pwd)/target-lld.mk
endif
-objc := clang $(more)
+objc := $(cc)
define _
strip/$(1) := strip
diff --git a/env/target-lld.mk b/env/target-lld.mk
index 0f303493b..4bad4fc72 100644
--- a/env/target-lld.mk
+++ b/env/target-lld.mk
@@ -9,7 +9,12 @@
# }}}
+# XXX: ring needs to update to a newer version of cc-rs
+# https://github.com/briansmith/ring/issues/2126
+# XXX: this also runs into some issue with --gc-sections
+ifneq ($(meson),darwin)
include $(pwd)/target-gnu.mk
+endif
wflags += -fuse-ld=lld
lflags += -Wl,--error-limit=0