Skip to content

Commit 9379402

Browse files
committed
use gcc11 on macos-x86_64 so we can use MACOSX_DEPLOYMENT_TARGET='10.9'
1 parent 69ecd81 commit 9379402

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

tools/build_steps.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ function before_build {
4747
source tools/gfortran_utils.sh
4848
install_gfortran
4949
EOF
50-
# Deployment target set by gfortran_utils
51-
echo "Deployment target $MACOSX_DEPLOYMENT_TARGET"
5250
5351
# Build the objconv tool
5452
(cd ${ROOT_DIR}/objconv && bash ../tools/build_objconv.sh)
@@ -161,7 +159,7 @@ function do_build_lib {
161159
CFLAGS="$CFLAGS -arch x86_64"
162160
export SDKROOT=${SDKROOT:-$(xcrun --show-sdk-path)}
163161
local dynamic_list="CORE2 NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
164-
MACOSX_DEPLOYMENT_TARGET="10.13"
162+
MACOSX_DEPLOYMENT_TARGET="10.9"
165163
;;
166164
*-i686)
167165
local bitness=32

tools/gfortran_utils.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if [ "$(uname)" == "Darwin" ]; then
2929
function download_and_unpack_gfortran {
3030
local arch=$1
3131
local type=$2
32-
curl -L -O https://github.com/isuruf/gcc/releases/download/gcc-15.2.0/gfortran-darwin-${arch}-${type}.tar.gz
32+
local gccver=gcc-15.2.0
3333
case ${arch}-${type} in
3434
arm64-native)
3535
local GFORTRAN_SHA=999a91eef894d32f99e3b641520bef9f475055067f301f0f1947b8b716b5922a
@@ -38,13 +38,16 @@ if [ "$(uname)" == "Darwin" ]; then
3838
local export GFORTRAN_SHA=39ef2590629c2f238f1a67469fa429d8d6362425b277abb57fd2f3c982568a3f
3939
;;
4040
x86_64-native)
41-
local export GFORTRAN_SHA=fb03c1f37bf0258ada6e3e41698e3ad416fff4dad448fd746e01d8ccf1efdc0f
41+
#override gccver
42+
gccver=gcc-11.3.0.2
43+
local export GFORTRAN_SHA=981367dd0ad4335613e91bbee453d60b6669f5d7e976d18c7bdb7f1966f26ae4
4244
;;
4345
x86_64-cross)
4446
local export GFORTRAN_SHA=0a19ca91019a75501e504eed1cad2be6ea92ba457ec815beb0dd28652eb0ce3f
4547
;;
4648
*) echo Did not recognize arch-plat $arch-$plat; return 1 ;;
4749
esac
50+
curl -L -O https://github.com/isuruf/gcc/releases/download/${gccver}/gfortran-darwin-${arch}-${type}.tar.gz
4851
local filesha=$(python3 tools/sha256sum.py gfortran-darwin-${arch}-${type}.tar.gz)
4952
if [[ "$filesha" != "${GFORTRAN_SHA}" ]]; then
5053
echo shasum mismatch for gfortran-darwin-${arch}-${type}

0 commit comments

Comments
 (0)