From a146a27beb27886ea6deb04b55e6568a115f2ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=AD=90caitp=E2=AD=90?= Date: Tue, 21 Mar 2023 11:34:06 -0400 Subject: [PATCH] fix(ios): Xcode 14 toolchain support for v8 10 (#1) --- .../v8_build_xcode14_toolchain_fixes.patch | 22 +++++++++++++++++++ scripts/build.sh | 2 +- scripts/patch.sh | 3 +++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 patches/v8_build_xcode14_toolchain_fixes.patch diff --git a/patches/v8_build_xcode14_toolchain_fixes.patch b/patches/v8_build_xcode14_toolchain_fixes.patch new file mode 100644 index 0000000..f34d03a --- /dev/null +++ b/patches/v8_build_xcode14_toolchain_fixes.patch @@ -0,0 +1,22 @@ +diff --git a/build/config/ios/BUILD.gn b/build/config/ios/BUILD.gn +index 52e2e4a56..ea5aed948 100644 +--- a/build/config/ios/BUILD.gn ++++ b/build/config/ios/BUILD.gn +@@ -131,6 +131,8 @@ config("runtime_library") { + _xcode_clang_version = "13.0.0" + } else if (xcode_version_int == 1330) { + _xcode_clang_version = "13.1.6" ++ } else if (xcode_version_int >= 1400) { ++ _xcode_clang_version = "14.0.0" + } else { + assert(false) + } +@@ -151,6 +153,8 @@ config("runtime_library") { + _xcode_clang_version = "13.0.0" + } else if (xcode_version_int == 1330) { + _xcode_clang_version = "13.1.6" ++ } else if (xcode_version_int >= 1400) { ++ _xcode_clang_version = "14.0.0" + } else { + assert(false) + } diff --git a/scripts/build.sh b/scripts/build.sh index ae2cf3b..0daf3bf 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -110,7 +110,7 @@ function buildArch() copySnapshot $arch copyMkcodecache $arch else - date ; ninja ${NINJA_PARAMS} -C "out.v8.${arch}" v8_base_without_compiler v8_compiler v8_libplatform v8_libbase v8_bigint v8_snapshot torque_generated_initializers torque_generated_definitions cppgc_base v8_heap_base_headers v8_heap_base ; date + date ; ninja ${NINJA_PARAMS} -C "out.v8.${arch}" v8_base_without_compiler v8_compiler v8_libplatform v8_libbase v8_bigint v8_snapshot torque_generated_initializers torque_generated_definitions cppgc_base v8_heap_base_headers v8_heap_base inspector ; date copyLib $arch # copySnapshot $arch # copyMkcodecache $arch diff --git a/scripts/patch.sh b/scripts/patch.sh index 62419b6..a60bbd5 100755 --- a/scripts/patch.sh +++ b/scripts/patch.sh @@ -49,6 +49,9 @@ V8_PATCHSET_IOS=( # Fix for [react-native-bottom-sheet](https://github.com/gorhom/react-native-bottom-sheet) not working # revert https://chromium-review.googlesource.com/c/v8/v8/+/3548458 # "fix_for_bottom_sheet.patch" + + # Find libclang_rt.iossim.a on Xcode 14 + "v8_build_xcode14_toolchain_fixes.patch" ) V8_PATCHSET_MACOS_ANDROID=(