From 3c79212319d878b07ef259d735b52b379f774e25 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Tue, 23 Jun 2020 12:24:53 -0700 Subject: [PATCH] [Host] Check for TARGET_OS_EMBEDDED instead of listing architectures. With the advent of Apple Silicon, checking for the architectures specifically is not correct anymore. This code is only supposed to run on embedded devices (iPhones et similia), so mark it accordingly. --- lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm index fd88d0c31de6..8d8db2f246a7 100644 --- a/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm +++ b/lldb/source/Host/macosx/objcxx/HostInfoMacOSX.mm @@ -136,7 +136,7 @@ bool HostInfoMacOSX::ComputeSupportExeDirectory(FileSpec &file_spec) { size_t framework_pos = raw_path.find("LLDB.framework"); if (framework_pos != std::string::npos) { framework_pos += strlen("LLDB.framework"); -#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__) +#if TARGET_OS_EMBEDDED // Shallow bundle raw_path.resize(framework_pos); #else