Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 10:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GH-1368: Use --osx-sysroot for macOS CI builds

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-06-23 13:09:00 -07:00
parent 239ea51f22
commit cbd4c5ebf9
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.cirrus.yml
View file

@ -219,7 +219,7 @@ macos_big_sur_task:
macos_catalina_task: macos_catalina_task:
macos_instance: macos_instance:
image: catalina-xcode-11.6 image: catalina-xcode
prepare_script: ./ci/macos/prepare.sh prepare_script: ./ci/macos/prepare.sh
<< : *CI_TEMPLATE << : *CI_TEMPLATE
<< : *MACOS_RESOURCES_TEMPLATE << : *MACOS_RESOURCES_TEMPLATE

6
ci/build.sh
View file

@ -3,6 +3,12 @@
set -e set -e
set -x set -x
# If we're on macOS, use --osx-sysroot to ensure we can find the SDKs from Xcode. This avoids
# some problems with Catalina specifically, but it doesn't break anything on Big Sur either.
if [ "${CIRRUS_OS}" == "darwin" ]; then
export ZEEK_CI_CONFIGURE_FLAGS="${ZEEK_CI_CONFIGURE_FLAGS} --osx-sysroot=$(xcrun --show-sdk-path)"
fi
if [ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]; then if [ "${ZEEK_CI_CREATE_ARTIFACT}" != "1" ]; then
./configure ${ZEEK_CI_CONFIGURE_FLAGS} ./configure ${ZEEK_CI_CONFIGURE_FLAGS}
cd build cd build