From 7774c0d0471161378138694eba117d9adb2d9010 Mon Sep 17 00:00:00 2001 From: Alexandru Savulescu Date: Fri, 28 Jan 2022 22:32:36 +0100 Subject: [PATCH] fix merge issue build_wheels.bash --- packaging/python/build_wheels.bash | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packaging/python/build_wheels.bash b/packaging/python/build_wheels.bash index bab7de9cdc..08c0e89a8c 100755 --- a/packaging/python/build_wheels.bash +++ b/packaging/python/build_wheels.bash @@ -115,13 +115,9 @@ build_wheel_osx() { pip install -U delocate -r packaging/python/build_requirements.txt pip_numpy_install + echo " - Building..." rm -rf dist build - if [ "$2" == "--bare" ]; then - python setup.py bdist_wheel - else - python setup.py build_ext --cmake-defs="NRN_MPI_DYNAMIC=$3" bdist_wheel - fi # We need to "fix" the platform tag if the Python installer is universal2 # See: @@ -135,7 +131,12 @@ build_wheel_osx() { echo " - Python installation is universal2, setting _PYTHON_HOST_PLATFORM to: ${_PYTHON_HOST_PLATFORM}" fi - python setup.py build_ext --cmake-prefix="/opt/nrnwheel/ncurses;/opt/nrnwheel/readline;/usr/x11" --cmake-defs="$CMAKE_DEFS" $setup_args bdist_wheel + if [ "$2" == "--bare" ]; then + python setup.py bdist_wheel + else + python setup.py build_ext --cmake-defs="NRN_MPI_DYNAMIC=$3" bdist_wheel + fi + echo " - Calling delocate-listdeps" delocate-listdeps dist/*.whl