Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
- cleanup the scripts a little to get rid of some stuff from debugging
  the process
- drop MacOS 14 support for now (and by extension Mac OS 15) as it
  is on the M1+ ARM processor set and there seems to be some linker
  issues.
  • Loading branch information
BenjamenMeyer committed Dec 24, 2024
1 parent 47c2808 commit ee1c18c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 14 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/macos-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ jobs:
fail-fast: false
matrix:
os:
# x86-64
- macos-13
- macos-14
# M1 processor
# M1 processor
#- macos-14
compiler:
- clang
- gcc
Expand Down
17 changes: 5 additions & 12 deletions script/cibuild
Original file line number Diff line number Diff line change
Expand Up @@ -61,34 +61,27 @@ then

HOMEBREW_PREFIX="$(brew --prefix)"
HOMEBREW_BIN="${HOMEBREW_PREFIX}/bin"
# $(brew --prefix python) links to the wrong version of Python for Boost so while:
# HOMEBREW_PYTHON_BIN="$(brew --prefix python)/libexec/bin"
# would be preferred we need to do the following instead:
#HOMEBREW_PYTHON_BIN="${HOMEBREW_PREFIX}/opt/python@${BUILD_WITH_PYTHON_VERSION}/libexec/bin"
HOMEBREW_PYTHON_BIN="$(brew --prefix python)/libexec/bin"

# NOTE: we do not support builds on MacOS ARM right now as there are some linker errors.
# Any help in making those work would be appreciated.

echo "Build With Python Version: ${BUILD_WITH_PYTHON_VERSION}"
echo " Homebrew Prefix: ${HOMEBREW_PREFIX}"
echo " Homebrew Bin: ${HOMEBREW_BIN}"
echo " Homebrew Python Bin: ${HOMEBREW_PYTHON_BIN}"

# Homebrew tooling needs to come first in the path search
export PATH=${HOMEBREW_BIN}:${HOMEBREW_PYTHON_BIN}:${PATH}
#echo "Review Homebrew Applications:"
#ls ${HOMEBREW_BIN}
#echo "Review Homebrew Python Applications:"
#ls ${HOMEBREW_PYTHON_BIN}

HOMEBREW_PYTHON_VERSION=$(${HOMEBREW_BIN}/python${BUILD_WITH_PYTHON_VERSION} -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
echo " Detected Python Version: ${HOMEBREW_PYTHON_VERSION}"

# Ensure it uses the correct Python version
#export PYTHONHOME="${HOMEBREW_BIN}/lib/python${HOMEBREW_PYTHON_VERSION}"
#export PYTHONPATH="${HOMEBREW_BIN}/lib/python${HOMEBREW_PYTHON_VERSION}/site-packages"
# Do not set PYTHONHOME or PYTHONPATH; otherwise some odd errors will come up as
# it's not necessary
export HOMEBREW_PYTHON3_CFLAGS="$(${HOMEBREW_BIN}/python${BUILD_WITH_PYTHON_VERSION}-config --cflags)"
export HOMEBREW_PYTHON3_LDFLAGS="$(${HOMEBREW_BIN}/python${BUILD_WITH_PYTHON_VERSION}-config --ldflags)"
#echo " Python Home: ${PYTHONHOME}"
#echo " Python Path: ${PYTHONPATH}"
echo " Homebrew Python CFlags: ${HOMEBREW_PYTHON3_CLFLAGS}"
echo " Homebrew Python LDFlags: ${HOMEBREW_PYTHON3_LDFLAGS}"

Expand Down

0 comments on commit ee1c18c

Please sign in to comment.