Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-18 00:34:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci/platforms: necessary changes for macos-15-intel and macos-14 Apple Silicon

Browse Source 
macos-15-intel  and  macos-14 Apple Silicon
- bloaty()
   aligned with the latest version

macos-15-intel
 - avr_gcc_toolchain()
     Latest version not available for Intel,
     so it needs to be built from source, which takes over an hour.
     The latest version prebuilt for Intel is 9.4.0
     Added an workaround for installation.

Signed-off-by: simbit18 <simbit18@gmail.com>
This commit is contained in:
simbit18
2025-11-26 11:21:19 +01:00
committed by Lup Yuen Lee
parent 027613fee2
commit b749dfba23
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/ci/platforms/darwin.sh
+23 -3
View File
@@ -92,8 +92,28 @@ arm64_gcc_toolchain() {
avr_gcc_toolchain() {
if ! type avr-gcc > /dev/null 2>&1; then
brew tap osx-cross/avr
brew install avr-gcc
# Latest version not available for Intel,
# so it needs to be built from source, which takes over an hour.
# The latest version prebuilt for Intel is 9.4.0
# This is a workaround for installation.
local basefile
basefile=avr-gcc@9-9.4.0_1
cd /usr/local/Homebrew
git checkout 4.6.3
cd "${NUTTXTOOLS}"
curl -O -L -s https://github.com/osx-cross/homebrew-avr/archive/refs/tags/${basefile}.tar.gz
tar zxf ${basefile}.tar.gz
cd "${NUTTXTOOLS}"/homebrew-avr-avr-gcc-9-9.4.0_1/Formula
brew install --formula ./avr-binutils.rb
brew install --formula ./avr-gcc@9.rb
cd ../..
rm -f ${basefile}.tar.gz
rm -rf homebrew-avr-avr-gcc-9-9.4.0_1
cd /usr/local/Homebrew
git checkout main
fi
command avr-gcc --version
@@ -132,7 +152,7 @@ bloaty() {
# https://github.com/google/bloaty/pull/326
# https://github.com/google/bloaty/pull/347
# https://github.com/google/bloaty/pull/385
git checkout 8026607280ef139bc0ea806e88cfe4fd0af60bad
# 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
tools/ci/platforms/darwin_arm64.sh
+1 -1
View File
@@ -130,7 +130,7 @@ bloaty() {
cd "${NUTTXTOOLS}"/bloaty-src
# Due to issues with latest MacOS versions use pinned commit.
# https://github.com/google/bloaty/pull/326
git checkout 52948c107c8f81045e7f9223ec02706b19cfa882
# git checkout 52948c107c8f81045e7f9223ec02706b19cfa882
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