Skip to content

Commit 7b94401

Browse files
committed
#980 fixed
1 parent cae8e97 commit 7b94401

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ jobs:
5454
# Backport gfortran shared libraries to version 9 folder. This is necessary because all macOS releases of fpm
5555
# have these paths hardcoded in the executable (no PIC?). As the gcc ABIs have not changed from 9 to 10, we
5656
# can just create symbolic links for now. This can be removed when an updated fpm release is built with gcc-10
57-
# mkdir /usr/local/opt/gcc@9
58-
# mkdir /usr/local/opt/gcc@9/lib
59-
# mkdir /usr/local/opt/gcc@9/lib/gcc
60-
# mkdir /usr/local/opt/gcc@9/lib/gcc/9
61-
# mkdir /usr/local/lib/gcc/9
62-
# ln -fs /usr/local/opt/gcc@${GCC_V}/lib/gcc/${GCC_V}/libquadmath.0.dylib /usr/local/opt/gcc@9/lib/gcc/9/libquadmath.0.dylib
63-
# ln -fs /usr/local/opt/gcc@${GCC_V}/lib/gcc/${GCC_V}/libgfortran.5.dylib /usr/local/opt/gcc@9/lib/gcc/9/libgfortran.5.dylib
64-
# ln -fs /usr/local/lib/gcc/${GCC_V}/libgcc_s.1.dylib /usr/local/lib/gcc/9/libgcc_s.1.dylib
57+
mkdir /usr/local/opt/gcc@9
58+
mkdir /usr/local/opt/gcc@9/lib
59+
mkdir /usr/local/opt/gcc@9/lib/gcc
60+
mkdir /usr/local/opt/gcc@9/lib/gcc/9
61+
mkdir /usr/local/lib/gcc/9
62+
ln -fs /usr/local/opt/gcc@${GCC_V}/lib/gcc/${GCC_V}/libquadmath.0.dylib /usr/local/opt/gcc@9/lib/gcc/9/libquadmath.0.dylib
63+
ln -fs /usr/local/opt/gcc@${GCC_V}/lib/gcc/${GCC_V}/libgfortran.5.dylib /usr/local/opt/gcc@9/lib/gcc/9/libgfortran.5.dylib
64+
ln -fs /usr/local/lib/gcc/${GCC_V}/libgcc_s.1.dylib /usr/local/lib/gcc/9/libgcc_s.1.dylib
6565
6666
- name: Install GFortran Linux
6767
if: contains(matrix.os, 'ubuntu')

src/fpm/git.f90

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,7 @@ subroutine git_archive(source, destination, ref, verbose, error)
448448
call fatal_error(error, "Cannot find a suitable archive format for 'git archive'."); return
449449
end if
450450

451-
call run('git archive ' &
452-
// ref // &
453-
' --format=' // archive_format // &
454-
' -o ' // destination , echo=verbose, exitstat=stat)
451+
call run('git archive '//ref//' --format='//archive_format//' -o '//destination, echo=verbose, exitstat=stat)
455452
if (stat /= 0) then
456453
call fatal_error(error, "Error packing '"//source//"'."); return
457454
end if

src/fpm_compiler.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ subroutine get_release_compile_flags(id, flags)
310310

311311
case(id_intel_classic_mac)
312312
flags = &
313-
! flag_intel_opt//& ! commented to debug #980
313+
flag_intel_opt//&
314314
flag_intel_fp//&
315315
flag_intel_align//&
316316
flag_intel_limit//&

0 commit comments

Comments
 (0)