Skip to content

Commit 11b6fa1

Browse files
committed
use 'arch -?' to force achitecture selection on macOS
1 parent cd2d96f commit 11b6fa1

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ local/scipy_openblas64/include
1717
local/scipy_openblas64/*.so
1818
local/scipy_openblas64/*.pyd
1919
local/scipy_openblas64/*.dylib
20+
objconv/

tools/build_steps.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ function before_build {
1515
source ${ROOT_DIR}/multibuild/osx_utils.sh
1616
get_macpython_environment ${MB_PYTHON_VERSION} venv
1717
source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh
18-
install_gfortran
18+
# Since install_fortran uses `uname -a` to determine arch,
19+
# force the architecture
20+
arch -${PLAT} install_gfortran
1921
# Deployment target set by gfortran_utils
2022
echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"
2123

@@ -209,7 +211,7 @@ function do_build_lib {
209211
echo "Due to the qemu versions 7.2 causing utest cases to fail,"
210212
echo "the utest dsdot:dsdot_n_1 have been temporarily disabled."
211213
fi
212-
if [ -v dynamic_list ]; then
214+
if [ -n "$dynamic_list" ]; then
213215
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
214216
make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
215217
USE_OPENMP=0 NUM_THREADS=64 \

0 commit comments

Comments
 (0)