Skip to content

Commit 1556a97

Browse files
committed
Remove x86_64-apple-ios target that only built for 3.9
1 parent 501d3c6 commit 1556a97

File tree

4 files changed

+0
-103
lines changed

4 files changed

+0
-103
lines changed

cpython-unix/build-cpython.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -525,14 +525,6 @@ if [[ "${PYBUILD_PLATFORM}" = macos* ]]; then
525525
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} MACHDEP=darwin"
526526
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_sys_system=Darwin"
527527
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_sys_release=$(uname -r)"
528-
elif [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
529-
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} MACHDEP=iOS"
530-
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_sys_system=iOS"
531-
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_sys_release="
532-
# clock_settime() not available on iOS.
533-
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_func_clock_settime=no"
534-
# getentropy() not available on iOS.
535-
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_func_getentropy=no"
536528
else
537529
echo "unsupported target triple: ${TARGET_TRIPLE}"
538530
exit 1

cpython-unix/build-sqlite.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ pushd sqlite-autoconf-${SQLITE_VERSION}
1616
CONFIGURE_FLAGS="--build=${BUILD_TRIPLE} --host=${TARGET_TRIPLE}"
1717
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} --prefix=/tools/deps --disable-shared"
1818

19-
if [ "${TARGET_TRIPLE}" = "x86_64-apple-ios" ]; then
20-
CONFIGURE_FLAGS="${CONFIGURE_FLAGS} ac_cv_search_system=no"
21-
fi
22-
2319
# The SQLite autosetup looks for the C++ compiler if the variable is set and will fail if it's not
2420
# found, even if it's not needed. We don't actually have a C++ compiler in some builds, so ensure
2521
# it's not looked for.

cpython-unix/targets.yml

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -549,50 +549,6 @@ x86_64-apple-darwin:
549549
- zstd
550550
openssl_target: darwin64-x86_64-cc
551551

552-
x86_64-apple-ios:
553-
host_platforms:
554-
- macos_arm64
555-
- macos_x86_64
556-
pythons_supported:
557-
- '3.9'
558-
needs_toolchain: true
559-
apple_sdk_platform: iphonesimulator
560-
host_cc: clang
561-
host_cxx: clang++
562-
target_cc: clang
563-
target_cxx: clang++
564-
target_cflags:
565-
- '-arch'
566-
- 'x86_64'
567-
- '-mios-simulator-version-min=12.3'
568-
# Suppress extremely verbose warnings we see with LLVM 10.
569-
- '-Wno-nullability-completeness'
570-
- '-Wno-expansion-to-defined'
571-
# LLVM 11 contains commit https://reviews.llvm.org/D83250,
572-
# which enables -Werror for undef-prefix=TARGET_OS_.
573-
# However, the macOS SDK has headers that reference deprecated
574-
# TARGET_OS defines, like TARGET_OS_EMBEDDED. So LLVM 11 refuses
575-
# to work with the macOS SDKs out of the box. We work around
576-
# this by undoing the -Werror=undef-prefix in that commit.
577-
- '-Wno-undef-prefix'
578-
- '-fvisibility=hidden'
579-
target_ldflags:
580-
- '-arch'
581-
- 'x86_64'
582-
- '-mios-simulator-version-min=12.3'
583-
needs:
584-
- autoconf
585-
- bzip2
586-
- expat
587-
- libffi
588-
- m4
589-
- mpdecimal
590-
- openssl-3.5
591-
- sqlite
592-
- xz
593-
- zstd
594-
openssl_target: darwin64-x86_64-cc
595-
596552
x86_64-apple-tvos:
597553
host_platforms:
598554
- macos_arm64

src/validation.rs

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ const RECOGNIZED_TRIPLES: &[&str] = &[
4949
"s390x-unknown-linux-gnu",
5050
"thumbv7k-apple-watchos",
5151
"x86_64-apple-darwin",
52-
"x86_64-apple-ios",
5352
"x86_64-apple-tvos",
5453
"x86_64-apple-watchos",
5554
"x86_64-pc-windows-msvc",
@@ -491,49 +490,6 @@ static DARWIN_ALLOWED_DYLIBS: Lazy<Vec<MachOAllowedDylib>> = Lazy::new(|| {
491490
.to_vec()
492491
});
493492

494-
static IOS_ALLOWED_DYLIBS: Lazy<Vec<MachOAllowedDylib>> = Lazy::new(|| {
495-
[
496-
MachOAllowedDylib {
497-
name: "@executable_path/../lib/libpython3.10.dylib".to_string(),
498-
max_compatibility_version: "3.10.0".try_into().unwrap(),
499-
required: false,
500-
},
501-
MachOAllowedDylib {
502-
name: "@executable_path/../lib/libpython3.10d.dylib".to_string(),
503-
max_compatibility_version: "3.10.0".try_into().unwrap(),
504-
required: false,
505-
},
506-
MachOAllowedDylib {
507-
name: "@executable_path/../lib/libpython3.11.dylib".to_string(),
508-
max_compatibility_version: "3.11.0".try_into().unwrap(),
509-
required: false,
510-
},
511-
MachOAllowedDylib {
512-
name: "@executable_path/../lib/libpython3.11d.dylib".to_string(),
513-
max_compatibility_version: "3.11.0".try_into().unwrap(),
514-
required: false,
515-
},
516-
// For some reason, CoreFoundation is present in debug/noopt builds but not
517-
// LTO builds.
518-
MachOAllowedDylib {
519-
name: "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation".to_string(),
520-
max_compatibility_version: "150.0.0".try_into().unwrap(),
521-
required: false,
522-
},
523-
MachOAllowedDylib {
524-
name: "/usr/lib/libSystem.B.dylib".to_string(),
525-
max_compatibility_version: "1.0.0".try_into().unwrap(),
526-
required: true,
527-
},
528-
MachOAllowedDylib {
529-
name: "/usr/lib/libz.1.dylib".to_string(),
530-
max_compatibility_version: "1.0.0".try_into().unwrap(),
531-
required: true,
532-
},
533-
]
534-
.to_vec()
535-
});
536-
537493
static ALLOWED_DYLIBS_BY_MODULE: Lazy<HashMap<&'static str, Vec<MachOAllowedDylib>>> =
538494
Lazy::new(|| {
539495
[(
@@ -574,7 +530,6 @@ static PLATFORM_TAG_BY_TRIPLE: Lazy<HashMap<&'static str, &'static str>> = Lazy:
574530
("riscv64-unknown-linux-gnu", "linux-riscv64"),
575531
("s390x-unknown-linux-gnu", "linux-s390x"),
576532
("x86_64-apple-darwin", "macosx-10.15-x86_64"),
577-
("x86_64-apple-ios", "iOS-x86_64"),
578533
("x86_64-pc-windows-msvc", "win-amd64"),
579534
("x86_64-unknown-linux-gnu", "linux-x86_64"),
580535
("x86_64_v2-unknown-linux-gnu", "linux-x86_64"),
@@ -879,7 +834,6 @@ fn allowed_dylibs_for_triple(triple: &str) -> Vec<MachOAllowedDylib> {
879834
match triple {
880835
"aarch64-apple-darwin" => DARWIN_ALLOWED_DYLIBS.clone(),
881836
"x86_64-apple-darwin" => DARWIN_ALLOWED_DYLIBS.clone(),
882-
"x86_64-apple-ios" => IOS_ALLOWED_DYLIBS.clone(),
883837
_ => vec![],
884838
}
885839
}
@@ -1221,7 +1175,6 @@ fn validate_macho<Mach: MachHeader<Endian = Endianness>>(
12211175
let wanted_cpu_type = match target_triple {
12221176
"aarch64-apple-darwin" => object::macho::CPU_TYPE_ARM64,
12231177
"x86_64-apple-darwin" => object::macho::CPU_TYPE_X86_64,
1224-
"x86_64-apple-ios" => object::macho::CPU_TYPE_X86_64,
12251178
_ => return Err(anyhow!("unhandled target triple: {}", target_triple)),
12261179
};
12271180

0 commit comments

Comments
 (0)