Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MacOS Build Support: Script update to handle MacOS v11 and v14 #415

Merged
merged 1 commit into from
Aug 26, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/helpers/build_darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ echo "Disk space available: ${DISK_AVAIL}G"
[[ "${DISK_AVAIL}" -lt "${DISK_MIN}" ]] && echo " - You must have at least ${DISK_MIN}GB of available storage to install FIO." && exit 1

echo
[[ $ARCH == "Darwin" && $OS_MAJ -lt 14 ]] && echo " - You must be running 14.0 or higher to build FIO." && exit 1
[[ $ARCH == "Darwin" && ( $OS_MAJ -ne 11 && $OS_MAJ -ne 14 ) ]] && echo " - You must be running MacOS 11.0 or 14.0 to build FIO." && exit 1

echo "${COLOR_CYAN}[Ensuring xcode-select installation]${COLOR_NC}"
if ! XCODESELECT=$( command -v xcode-select ); then echo " - xcode-select must be installed in order to proceed!" && exit 1;
Expand All @@ -31,7 +31,7 @@ if [ ! -d /usr/local/Frameworks ]; then
fi

# Apply patches to fio fc and yubihsm submodules for MacOS Darwin 14+ openssl compatibility
[[ $OS_MAJ -ge 14 ]] && apply-fio-darwin14-patches && echo
[[ $OS_MAJ -eq 14 ]] && apply-fio-darwin14-patches && echo

# Handle clang/compiler
ensure-compiler
Expand Down