Roll to a patched version of libcxxabi that is compatible with the latest Clang Mac/iOS toolchain (flutter/engine#35873)

This commit is contained in:
Jason Simmons 2022-09-07 11:27:16 -07:00 committed by GitHub
parent 11d2c0a59b
commit 670f8dc88f
2 changed files with 5 additions and 3 deletions

4
DEPS
View File

@ -102,7 +102,7 @@ allowed_hosts = [
]
deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '25e5fd0200ff0bbf4761f3e73cab67a16e928955',
'src': 'https://github.com/flutter/buildroot.git' + '@' + '9639de21458b03a5f7d4e9733eef17330dc6d835',
# Fuchsia compatibility
#
@ -120,7 +120,7 @@ deps = {
Var('llvm_git') + '/llvm-project/libcxx' + '@' + '44079a4cc04cdeffb9cfe8067bfb3c276fb2bab0',
'src/third_party/libcxxabi':
Var('llvm_git') + '/llvm-project/libcxxabi' + '@' + '2ce528fb5e0f92e57c97ec3ff53b75359d33af12',
Var('flutter_git') + '/third_party/libcxxabi' + '@' + '483f071ff4780a8884f32d97d2d262fbe9f1ae18',
'src/third_party/glfw':
Var('fuchsia_git') + '/third_party/glfw' + '@' + '78e6a0063d27ed44c2c4805606309744f6fb29fc',

View File

@ -81,7 +81,9 @@ int _checkIos(String outPath, String nmPath, Iterable<String> builds) {
final Iterable<NmEntry> unexpectedEntries = NmEntry.parse(nmResult.stdout as String).where((NmEntry entry) {
return !(((entry.type == '(__DATA,__common)' || entry.type == '(__DATA,__const)') && entry.name.startsWith('_Flutter'))
|| (entry.type == '(__DATA,__objc_data)'
&& (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter'))));
&& (entry.name.startsWith(r'_OBJC_METACLASS_$_Flutter') || entry.name.startsWith(r'_OBJC_CLASS_$_Flutter')))
// TODO(107887): This should not be neccesary after bitcode support is removed from the engine.
|| (entry.type == '(__TEXT,__text)' && entry.name == '___gxx_personality_v0'));
});
if (unexpectedEntries.isNotEmpty) {
print('ERROR: $libFlutter exports unexpected symbols:');