Skip to content

Fix macOS Pipeline #234

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.

Sign up for GitHub

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

Merged
5cript merged 3 commits into from
Oct 15, 2026
Merged

Fix macOS Pipeline #234

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8a9f76
macOS CI names the SDK's zlib for boost iostreams explicitly
5cript Oct 15, 2026
5930440
macOS dependency builds outside CMake name the SDK when linking
5cript Oct 15, 2026
69ff447
The macOS zlib check of boost iostreams no longer fails on a match
5cript Oct 15, 2026
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
26 changes: 19 additions & 7 deletions scripts/macos/build_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,11 @@ CLANGXX="${LLVM_ROOT}/bin/clang++"
exit 1
}

# Upstream clang honours both for the builds that do not go through CMake.
# Upstream clang honours both for the builds that do not go through CMake, but links without naming the SDK pick
# the newest one of the Command Line Tools, which the linker may not be able to read (an SDK of the next macOS), so
# those builds name it in SYSROOT_FLAGS as well.
export SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
SYSROOT_FLAGS="-isysroot ${SDKROOT}"
export MACOSX_DEPLOYMENT_TARGET="${MINIMUM_MACOS}"

WORK="${PREFIX}.work"
Expand Down Expand Up @@ -257,8 +260,8 @@ build_cryptopp() {
# The makefile probes the ARM crypto extensions with small test programs, those have to link too.
make -C "${source}" -j "${JOBS}" static \
CXX="${CLANGXX}" \
CXXFLAGS="-DNDEBUG -O3 -fPIC ${LIBCXX_COMPILE_FLAGS}" \
LDFLAGS="${LIBCXX_LINK_FLAGS}"
CXXFLAGS="-DNDEBUG -O3 -fPIC ${SYSROOT_FLAGS} ${LIBCXX_COMPILE_FLAGS}" \
LDFLAGS="${SYSROOT_FLAGS} ${LIBCXX_LINK_FLAGS}"
mkdir -p "${PREFIX}/include/cryptopp" "${PREFIX}/lib"
cp "${source}"/*.h "${PREFIX}/include/cryptopp/"
cp "${source}/libcryptopp.a" "${PREFIX}/lib/"
Expand All @@ -273,11 +276,12 @@ build_boost() {
cd "${source}"
./bootstrap.sh
cat > user-config.jam <<JAM
using clang : nui : "${CLANGXX}" : <cxxflags>"${LIBCXX_COMPILE_FLAGS}" <linkflags>"${LIBCXX_LINK_FLAGS}" ;
using clang : nui : "${CLANGXX}" : <cxxflags>"${SYSROOT_FLAGS} ${LIBCXX_COMPILE_FLAGS}" <linkflags>"${SYSROOT_FLAGS} ${LIBCXX_LINK_FLAGS}" ;
JAM
# Only the compiled libraries are listed, the headers of all of boost are installed regardless.
# Nui gzips its assets through iostreams, with the zlib of the SDK. The standard matches nui-sftp,
# boost's configuration macros change signatures between standards.
# Nui gzips its assets through iostreams, with the zlib of the SDK; without SYSROOT_FLAGS b2's link checks
# fail and iostreams is built without it. The standard matches nui-sftp, boost's configuration macros
# change signatures between standards.
./b2 --user-config=user-config.jam toolset=clang-nui \
variant=release link=static threading=multi cxxstd=23 cxxstd-dialect=gnu \
--prefix="${PREFIX}" --layout=system -j "${JOBS}" -d1 \
Expand All @@ -286,7 +290,15 @@ JAM
--with-filesystem --with-iostreams --with-process --with-program_options --with-random \
--with-serialization --with-system --with-thread \
install
)
# Captured first: grep -q ends the pipe early and pipefail would count nm's SIGPIPE as a failure.
local symbols
symbols="$("${LLVM_ROOT}/bin/llvm-nm" "${PREFIX}/lib/libboost_iostreams.a" 2>/dev/null || true)"
if ! grep -q zlib_error <<<"${symbols}"; then
echo "boost iostreams was built without zlib, b2's configuration log:" >&2
cat bin.v2/config.log >&2 || true
exit 1
fi
) || exit 1
mark_built boost "${BOOST_VERSION}"
}

Expand Down
Loading