Skip to content

Commit 7acd8fc

Browse files
committed
use gfortran from macos-15 images
1 parent 857fe2d commit 7acd8fc

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@
44
[submodule "multibuild"]
55
path = multibuild
66
url = https://github.com/multi-build/multibuild.git
7-
[submodule "gfortran-install"]
8-
path = gfortran-install
9-
url = https://github.com/MacPython/gfortran-install.git

gfortran-install

Lines changed: 0 additions & 1 deletion
This file was deleted.

tools/build_steps.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,8 @@ function before_build {
2121
fi
2222
source ${ROOT_DIR}/multibuild/osx_utils.sh
2323
get_macpython_environment ${MB_PYTHON_VERSION} venv
24-
# Since install_fortran uses `uname -a` to determine arch,
25-
# force the architecture
26-
arch -${PLAT} bash -s << EOF
27-
source ${ROOT_DIR}/gfortran-install/gfortran_utils.sh
28-
install_gfortran
29-
EOF
30-
# Deployment target set by gfortran_utils
31-
echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"
24+
25+
alias gfortran gfortran-15
3226

3327
# Build the objconv tool
3428
(cd ${ROOT_DIR}/objconv && bash ../tools/build_objconv.sh)
@@ -166,6 +160,7 @@ function do_build_lib {
166160
# Pick up the gfortran runtime libraries
167161
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
168162
CFLAGS="$CFLAGS -arch x86_64"
163+
export MACOSX_DEPLOYMENT_TARGET="11.0"
169164
export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
170165
;;
171166
*-i686)
@@ -181,7 +176,7 @@ function do_build_lib {
181176
local bitness=64
182177
local target="VORTEX"
183178
CFLAGS="$CFLAGS -ftrapping-math -mmacos-version-min=11.0"
184-
MACOSX_DEPLOYMENT_TARGET="11.0"
179+
export MACOSX_DEPLOYMENT_TARGET="11.0"
185180
export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
186181
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
187182
;;

0 commit comments

Comments
 (0)