From 566e1c3a7df2cad598dfb60ccee3e9e02e8ba3bf Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 13 Dec 2024 22:40:33 +0900 Subject: [PATCH] tools/ci/platforms/darwin.sh: bump bloaty version hopefully this can fix build failure on macos-13. (see below) i tested "cibuild.sh -i" with macOS 15.2, x86-64, Xcode 16.1. ``` [470/495] Linking CXX executable bloaty FAILED: bloaty : && /Applications/Xcode_15.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -W -Wall -Wno-sign-compare -fdiagnostics-color=always -O2 -g1 -isysroot /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk -mmacosx-version-min=13.7 -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/bloaty.dir/src/main.cc.o -o bloaty liblibbloaty.a third_party/protobuf/cmake/libprotoc.a third_party/re2/libre2.a third_party/capstone/libcapstone.a /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk/usr/lib/libz.tbd third_party/abseil-cpp/absl/strings/libabsl_strings.a third_party/protobuf/cmake/libprotobuf.a /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk/usr/lib/libz.tbd third_party/abseil-cpp/absl/strings/libabsl_strings_internal.a third_party/abseil-cpp/absl/base/libabsl_base.a third_party/abseil-cpp/absl/base/libabsl_spinlock_wait.a third_party/abseil-cpp/absl/numeric/libabsl_int128.a third_party/abseil-cpp/absl/base/libabsl_throw_delegate.a third_party/abseil-cpp/absl/types/libabsl_bad_optional_access.a third_party/abseil-cpp/absl/base/libabsl_raw_logging_internal.a third_party/abseil-cpp/absl/base/libabsl_log_severity.a && : ld: Undefined symbols: absl::debugging_internal::Demangle(char const*, char*, int), referenced from: bloaty::ItaniumDemangle(std::__1::basic_string_view>, bloaty::DataSource) in liblibbloaty.a[2](bloaty.cc.o) clang: error: linker command failed with exit code 1 (use -v to see invocation) ``` --- tools/ci/platforms/darwin.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ci/platforms/darwin.sh b/tools/ci/platforms/darwin.sh index 9e75da2382c..5febb92e382 100755 --- a/tools/ci/platforms/darwin.sh +++ b/tools/ci/platforms/darwin.sh @@ -131,7 +131,8 @@ bloaty() { # Due to issues with latest MacOS versions use pinned commit. # https://github.com/google/bloaty/pull/326 # https://github.com/google/bloaty/pull/347 - git checkout 6b78e080efcb63fa4ef9d2c1f062e3d5bf158e94 + # https://github.com/google/bloaty/pull/385 + git checkout 8026607280ef139bc0ea806e88cfe4fd0af60bad mkdir -p "${NUTTXTOOLS}"/bloaty cmake -B build/bloaty -GNinja -D BLOATY_PREFER_SYSTEM_CAPSTONE=NO -D CMAKE_INSTALL_PREFIX="${NUTTXTOOLS}"/bloaty cmake --build build/bloaty