summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2022-06-09 14:35:28 -0500
committerBrian Smith <brian@dbsoft.org>2022-06-09 14:35:28 -0500
commit357463d9d7538c4dfdd525f2987c0d551f0c5e54 (patch)
treecc3f731b6952c0ebba7849841f8267940c2deea6
parente5152994778001456874f0341fe2abc0f8b16dc3 (diff)
downloaduxp-357463d9d7538c4dfdd525f2987c0d551f0c5e54.tar.gz
Issue #1905 - Part 3c - Remove iOS from the rest of the configure system.
-rw-r--r--aclocal.m41
-rw-r--r--build/autoconf/ios.m4108
-rw-r--r--build/gyp_base.mozbuild2
-rw-r--r--build/moz.configure/init.configure7
4 files changed, 1 insertions, 117 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 43ae3a368b..f14ddbf29c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -25,7 +25,6 @@ builtin(include, build/autoconf/zlib.m4)dnl
builtin(include, build/autoconf/icu.m4)dnl
builtin(include, build/autoconf/clang-plugin.m4)dnl
builtin(include, build/autoconf/alloc.m4)dnl
-builtin(include, build/autoconf/ios.m4)dnl
builtin(include, build/autoconf/sanitize.m4)dnl
MOZ_PROG_CHECKMSYS()
diff --git a/build/autoconf/ios.m4 b/build/autoconf/ios.m4
deleted file mode 100644
index b341cda895..0000000000
--- a/build/autoconf/ios.m4
+++ /dev/null
@@ -1,108 +0,0 @@
-dnl This Source Code Form is subject to the terms of the Mozilla Public
-dnl License, v. 2.0. If a copy of the MPL was not distributed with this
-dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-AC_DEFUN([MOZ_IOS_PATH_PROG],
-[
-changequote({,})
-_prog_name=ifelse($2, {}, `echo $1 | tr "[:upper:]" "[:lower:]"`, $2)
-changequote([,])
-AC_CACHE_CHECK([for $_prog_name in iOS SDK],
-ac_cv_ios_path_$1,
-[
-_path=`xcrun --sdk $ios_sdk --find $_prog_name 2>/dev/null`
-_res=$?
-if test $_res -ne 0; then
- AC_MSG_ERROR([Could not find '$_prog_name' in the iOS SDK])
-fi
-ac_cv_ios_path_$1=$_path
-])
-$1="${ac_cv_ios_path_$1}$3"
-])
-
-AC_DEFUN([MOZ_IOS_SDK],
-[
-
-MOZ_ARG_WITH_STRING(ios-sdk,
-[ --with-ios-sdk=TYPE
- Type of iOS SDK to use (iphonesimulator, iphoneos)
- and optionally version (like iphoneos8.2)],
- ios_sdk=$withval)
-
-MOZ_ARG_ENABLE_STRING(ios-target,
- [ --enable-ios-target=VER (default=8.0)
- Set the minimum iOS version needed at runtime],
- [_IOS_TARGET=$enableval])
-_IOS_TARGET_DEFAULT=8.0
-
-case "$target" in
-arm*-apple-darwin*)
- if test -z "$ios_sdk" -o "$ios_sdk" = "yes"; then
- ios_sdk=iphoneos
- fi
- case "$ios_sdk" in
- iphoneos*)
- ios_target_arg="-miphoneos-version-min"
- ;;
- *)
- AC_MSG_ERROR([Only 'iphoneos' SDKs are valid when targeting iOS device, don't know what to do with '$ios_sdk'.])
- ;;
- esac
- ;;
-*-apple-darwin*)
- ios_target_arg="-mios-simulator-version-min"
- case "$ios_sdk" in
- # Empty SDK is okay, this might be an OS X desktop build.
- ""|iphonesimulator*)
- ;;
- # Default to iphonesimulator
- yes)
- ios_sdk=iphonesimulator
- ;;
- *)
- AC_MSG_ERROR([Only 'iphonesimulator' SDKs are valid when targeting iOS simulator.])
- ;;
- esac
- ;;
-esac
-
-
-if test -n "$ios_sdk"; then
- if test -z "$_IOS_TARGET"; then
- _IOS_TARGET=$_IOS_TARGET_DEFAULT
- ios_target_arg="${ios_target_arg}=${_IOS_TARGET}"
- fi
- # Ensure that xcrun knows where this SDK is.
- ios_sdk_path=`xcrun --sdk $ios_sdk --show-sdk-path 2>/dev/null`
- _ret=$?
- if test $_ret -ne 0; then
- AC_MSG_ERROR([iOS SDK '$ios_sdk' could not be found.])
- fi
- MOZ_IOS=1
- export HOST_CC=clang
- export HOST_CXX=clang++
- # Add isysroot, arch, and ios target arguments
- case "$target_cpu" in
- arm*)
- ARGS="-arch armv7"
- ;;
- *)
- # Unfortunately simulator builds need this.
- export CROSS_COMPILE=1
- ;;
- esac
- ARGS=" $ARGS -isysroot $ios_sdk_path $ios_target_arg"
- # Now find our tools
- MOZ_IOS_PATH_PROG(CC, clang, $ARGS)
- MOZ_IOS_PATH_PROG(CXX, clang++, $ARGS)
- export CPP="$CC -E"
- export LD="$CXX"
- MOZ_IOS_PATH_PROG(AR)
- MOZ_IOS_PATH_PROG(AS, as, $ARGS)
- MOZ_IOS_PATH_PROG(OTOOL)
- MOZ_IOS_PATH_PROG(STRIP)
- export PKG_CONFIG_PATH=${ios_sdk_path}/usr/lib/pkgconfig/
-fi
-
-AC_SUBST(MOZ_IOS)
-])
diff --git a/build/gyp_base.mozbuild b/build/gyp_base.mozbuild
index a1f8acb099..a97b209a53 100644
--- a/build/gyp_base.mozbuild
+++ b/build/gyp_base.mozbuild
@@ -16,7 +16,7 @@ if os == 'WINNT':
flavors = {
'WINNT': 'win',
'Linux': 'linux',
- 'Darwin': 'mac' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' else 'ios',
+ 'Darwin': 'mac',
'SunOS': 'solaris',
'GNU/kFreeBSD': 'freebsd',
'DragonFly': 'dragonfly',
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
index f0d6b791b6..b138b79c82 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -321,9 +321,6 @@ def split_triplet(triplet):
elif os.startswith('darwin'):
canonical_kernel = 'Darwin'
canonical_os = 'OSX'
- elif os.startswith('ios'):
- canonical_kernel = 'Darwin'
- canonical_os = 'iOS'
elif os.startswith('dragonfly'):
canonical_os = canonical_kernel = 'DragonFly'
elif os.startswith('freebsd'):
@@ -455,10 +452,6 @@ add_old_configure_arg(host_for_old_configure)
@depends(host, target)
def target_for_old_configure(host, target):
target_alias = target.alias
- # old-configure does plenty of tests against $target and $target_os
- # and expects darwin for iOS, so make it happy.
- if target.os == 'iOS':
- target_alias = target_alias.replace('-ios', '-darwin')
return '--target=%s' % target_alias
add_old_configure_arg(target_for_old_configure)