summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2022-06-09 14:19:05 -0500
committerBrian Smith <brian@dbsoft.org>2022-06-09 14:19:05 -0500
commite5152994778001456874f0341fe2abc0f8b16dc3 (patch)
treebd52fc49c1c13009e4741e8def64aa986dc0da36
parentad1bd19571f3d958d69d8eb360898e0d37356533 (diff)
downloaduxp-e5152994778001456874f0341fe2abc0f8b16dc3.tar.gz
Issue #1905 - Part 3b - Remove iOS support from old-configure.
iOS is not really a viable target and Apple Silicon Macs report the same core system.
-rw-r--r--old-configure.in51
1 files changed, 7 insertions, 44 deletions
diff --git a/old-configure.in b/old-configure.in
index f848e720e4..e575f65fa5 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -95,12 +95,6 @@ case "$target" in
;;
esac
-case "$target" in
-*-apple-darwin*)
- MOZ_IOS_SDK
- ;;
-esac
-
AC_SUBST(OBJCOPY)
dnl ========================================================
@@ -775,27 +769,11 @@ case "$target" in
DLL_SUFFIX=".dylib"
DSO_LDOPTS=''
STRIP_FLAGS="$STRIP_FLAGS -x -S"
- # Ensure that if we're targeting iOS an SDK was provided.
- AC_CACHE_CHECK(for iOS target,
- ac_cv_ios_target,
- [AC_TRY_COMPILE([#include <TargetConditionals.h>
-#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR)
-#error not iOS
-#endif],
- [],
- ac_cv_ios_target="yes",
- ac_cv_ios_target="no")])
- if test "$ac_cv_ios_target" = "yes" -a -z $MOZ_IOS; then
- AC_MSG_ERROR([targeting iOS but not using an iOS SDK?])
- fi
- if test -n "$MOZ_IOS"; then
- direct_nspr_config=1
- else
- # The ExceptionHandling framework is needed for Objective-C exception
- # logging code in nsObjCExceptions.h. Currently we only use that in debug
- # builds.
- MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
- fi
+
+ # The ExceptionHandling framework is needed for Objective-C exception
+ # logging code in nsObjCExceptions.h. Currently we only use that in debug
+ # builds.
+ MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
if test "x$lto_is_enabled" = "xyes"; then
echo "Skipping -dead_strip because lto is enabled."
@@ -2027,9 +2005,6 @@ MOZ_OFFICIAL_BRANDING=
MC_OFFICIAL=
MOZ_FEEDS=1
MOZ_AUTH_EXTENSION=1
-if test "$MOZ_IOS"; then
- MOZ_AUTH_EXTENSION=
-fi
MOZ_RAW=
MOZ_AV1=
MOZ_VORBIS=
@@ -3015,10 +2990,6 @@ MOZ_ARG_DISABLE_BOOL(negotiateauth,
MOZ_AUTH_EXTENSION=,
MOZ_AUTH_EXTENSION=1 )
-if test -n "$MOZ_IOS" -a -n "$MOZ_AUTH_EXTENSION"; then
- AC_MSG_ERROR([negotiateauth is not supported on iOS.])
-fi
-
dnl ========================================================
dnl Pref extensions (autoconfig)
dnl ========================================================
@@ -3171,9 +3142,7 @@ MOZ_ARG_ENABLE_BOOL(gamepad,
if test "$MOZ_GAMEPAD"; then
case "$OS_TARGET" in
Darwin)
- if test -z "$MOZ_IOS"; then
- MOZ_GAMEPAD_BACKEND=cocoa
- fi
+ MOZ_GAMEPAD_BACKEND=cocoa
;;
WINNT)
MOZ_GAMEPAD_BACKEND=windows
@@ -3487,10 +3456,6 @@ dnl ========================================================
dnl Updater
dnl ========================================================
-if test "$MOZ_IOS"; then
- MOZ_UPDATER=
-fi
-
MOZ_ARG_ENABLE_BOOL(updater,
[ --enable-updater Enable building of internal updater],
MOZ_UPDATER=1,
@@ -4638,9 +4603,7 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
if test "$MOZ_NECKO_WIFI"; then
case "$OS_TARGET" in
Darwin)
- if test -z "$MOZ_IOS"; then
- NECKO_WIFI=1
- fi
+ NECKO_WIFI=1
;;
DragonFly|FreeBSD|WINNT)
NECKO_WIFI=1