diff --git a/tools/build_steps.sh b/tools/build_steps.sh index 5569eca1..b2ca1a7e 100644 --- a/tools/build_steps.sh +++ b/tools/build_steps.sh @@ -42,6 +42,7 @@ function before_build { # Since install_fortran uses `uname -a` to determine arch, # force the architecture arch -${PLAT} bash -s << EOF +set -ex source tools/gfortran_utils.sh install_gfortran EOF diff --git a/tools/gfortran_utils.sh b/tools/gfortran_utils.sh index b7127f50..fadd6d33 100644 --- a/tools/gfortran_utils.sh +++ b/tools/gfortran_utils.sh @@ -84,6 +84,8 @@ function check_gfortran { echo Missing gfortran exit 1 fi + echo gfortran version + gfortran --version } function get_gf_lib_for_suf { @@ -101,6 +103,7 @@ function get_gf_lib_for_suf { } if [ "$(uname)" == "Darwin" ]; then + set -ex mac_target=${MACOSX_DEPLOYMENT_TARGET:-$(get_macosx_target)} export MACOSX_DEPLOYMENT_TARGET=$mac_target # Keep this for now as some builds might depend on this being @@ -160,10 +163,10 @@ if [ "$(uname)" == "Darwin" ]; then } function install_gfortran { download_and_unpack_gfortran $(uname -m) native - check_gfortran if [[ "${PLAT:-}" == "universal2" || "${PLAT:-}" == "arm64" ]]; then install_arm64_cross_gfortran fi + check_gfortran } function get_gf_lib {