wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-30 20:37:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source
This commit is contained in:
Brian Smith 2022-06-09 14:19:05 -05:00 • committed by roytam1
commit a2f6708c4d
1 changed files with 7 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

51
old-configure.in
View file

@ -96,12 +96,6 @@ case "$target" in
;; ;;
esac esac
case "$target" in
*-apple-darwin*)
MOZ_IOS_SDK
;;
esac
AC_SUBST(ANDROID_SOURCE) AC_SUBST(ANDROID_SOURCE)
AC_SUBST(ANDROID_PACKAGE_NAME) AC_SUBST(ANDROID_PACKAGE_NAME)
AC_SUBST(OBJCOPY) AC_SUBST(OBJCOPY)
@ -787,27 +781,11 @@ case "$target" in
DLL_SUFFIX=".dylib" DLL_SUFFIX=".dylib"
DSO_LDOPTS='' DSO_LDOPTS=''
STRIP_FLAGS="$STRIP_FLAGS -x -S" STRIP_FLAGS="$STRIP_FLAGS -x -S"
# Ensure that if we're targeting iOS an SDK was provided.
AC_CACHE_CHECK(for iOS target, # The ExceptionHandling framework is needed for Objective-C exception
ac_cv_ios_target, # logging code in nsObjCExceptions.h. Currently we only use that in debug
[AC_TRY_COMPILE([#include <TargetConditionals.h> # builds.
#if !(TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR) MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling";
#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
if test "x$lto_is_enabled" = "xyes"; then if test "x$lto_is_enabled" = "xyes"; then
echo "Skipping -dead_strip because lto is enabled." echo "Skipping -dead_strip because lto is enabled."
@ -2084,9 +2062,6 @@ MOZ_OFFICIAL_BRANDING=
MC_OFFICIAL= MC_OFFICIAL=
MOZ_FEEDS=1 MOZ_FEEDS=1
MOZ_AUTH_EXTENSION=1 MOZ_AUTH_EXTENSION=1
if test "$MOZ_IOS"; then
MOZ_AUTH_EXTENSION=
fi
MOZ_RAW= MOZ_RAW=
MOZ_AV1= MOZ_AV1=
MOZ_VORBIS= MOZ_VORBIS=
@ -3092,10 +3067,6 @@ MOZ_ARG_DISABLE_BOOL(negotiateauth,
MOZ_AUTH_EXTENSION=, MOZ_AUTH_EXTENSION=,
MOZ_AUTH_EXTENSION=1 ) 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 ========================================================
dnl Pref extensions (autoconfig) dnl Pref extensions (autoconfig)
dnl ======================================================== dnl ========================================================
@ -3326,9 +3297,7 @@ MOZ_ARG_ENABLE_BOOL(gamepad,
if test "$MOZ_GAMEPAD"; then if test "$MOZ_GAMEPAD"; then
case "$OS_TARGET" in case "$OS_TARGET" in
Darwin) Darwin)
if test -z "$MOZ_IOS"; then MOZ_GAMEPAD_BACKEND=cocoa
MOZ_GAMEPAD_BACKEND=cocoa
fi
;; ;;
WINNT) WINNT)
MOZ_GAMEPAD_BACKEND=windows MOZ_GAMEPAD_BACKEND=windows
@ -3645,10 +3614,6 @@ dnl ========================================================
dnl Updater dnl Updater
dnl ======================================================== dnl ========================================================
if test "$MOZ_IOS"; then
MOZ_UPDATER=
fi
MOZ_ARG_ENABLE_BOOL(updater, MOZ_ARG_ENABLE_BOOL(updater,
[ --enable-updater Enable building of internal updater], [ --enable-updater Enable building of internal updater],
MOZ_UPDATER=1, MOZ_UPDATER=1,
@ -4852,9 +4817,7 @@ MOZ_ARG_DISABLE_BOOL(necko-wifi,
if test "$MOZ_NECKO_WIFI"; then if test "$MOZ_NECKO_WIFI"; then
case "$OS_TARGET" in case "$OS_TARGET" in
Darwin) Darwin)
if test -z "$MOZ_IOS"; then NECKO_WIFI=1
NECKO_WIFI=1
fi
;; ;;
DragonFly|FreeBSD|WINNT) DragonFly|FreeBSD|WINNT)
NECKO_WIFI=1 NECKO_WIFI=1