diff --git a/.github/workflows/apple_m.yml b/.github/workflows/apple_m.yml index 81952dabd..56d46cf0c 100644 --- a/.github/workflows/apple_m.yml +++ b/.github/workflows/apple_m.yml @@ -87,10 +87,16 @@ jobs: echo "max_size = 300M" > ~/.ccache/ccache.conf echo "compression = true" >> ~/.ccache/ccache.conf ccache -s + + - name: Add gfortran runtime to link path + if: matrix.build == 'make' && runner.os == 'macOS' + run: | + GFORTRAN_LIBDIR=$(gfortran -print-file-name=libgfortran.dylib | xargs dirname) + echo "Using gfortran runtime in $GFORTRAN_LIBDIR" + echo "LDFLAGS=-L/opt/homebrew/opt/llvm/lib -L$GFORTRAN_LIBDIR" >> $GITHUB_ENV - name: Build OpenBLAS run: | - export LDFLAGS="-L/opt/homebrew/opt/llvm/lib" export CPPFLAGS="-I/opt/homebrew/opt/llvm/include" export CC="/opt/homebrew/opt/llvm/bin/clang" case "${{ matrix.build }}" in diff --git a/Makefile.system b/Makefile.system index c1c910d31..3f1c48d23 100644 --- a/Makefile.system +++ b/Makefile.system @@ -426,10 +426,8 @@ ifeq ($(OSNAME), Darwin) ifndef MACOSX_DEPLOYMENT_TARGET ifeq ($(ARCH), arm64) export MACOSX_DEPLOYMENT_TARGET=11.0 -ifeq ($(C_COMPILER), GCC) export NO_SVE = 1 export NO_SME = 1 -endif else export MACOSX_DEPLOYMENT_TARGET=10.8 endif