#980 fixed

fortran-lang · Feb 25, 2024 · 7b94401 · 7b94401
1 parent cae8e97
commit 7b94401
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -54,14 +54,14 @@ jobs:
         # Backport gfortran shared libraries to version 9 folder. This is necessary because all macOS releases of fpm 
         # have these paths hardcoded in the executable (no PIC?). As the gcc ABIs have not changed from 9 to 10, we 
         # can just create symbolic links for now. This can be removed when an updated fpm release is built with gcc-10  
-        # mkdir /usr/local/opt/gcc@9
-        # mkdir /usr/local/opt/gcc@9/lib
-        # mkdir /usr/local/opt/gcc@9/lib/gcc
-        # mkdir /usr/local/opt/gcc@9/lib/gcc/9
-        # mkdir /usr/local/lib/gcc/9
-        # 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 
-        # 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
-        # ln -fs /usr/local/lib/gcc/${GCC_V}/libgcc_s.1.dylib /usr/local/lib/gcc/9/libgcc_s.1.dylib
+        mkdir /usr/local/opt/gcc@9
+        mkdir /usr/local/opt/gcc@9/lib
+        mkdir /usr/local/opt/gcc@9/lib/gcc
+        mkdir /usr/local/opt/gcc@9/lib/gcc/9
+        mkdir /usr/local/lib/gcc/9
+        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 
+        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
+        ln -fs /usr/local/lib/gcc/${GCC_V}/libgcc_s.1.dylib /usr/local/lib/gcc/9/libgcc_s.1.dylib
 
     - name: Install GFortran Linux
       if: contains(matrix.os, 'ubuntu')

diff --git a/src/fpm/git.f90 b/src/fpm/git.f90
@@ -448,10 +448,7 @@ subroutine git_archive(source, destination, ref, verbose, error)
       call fatal_error(error, "Cannot find a suitable archive format for 'git archive'."); return
     end if
 
-    call run('git archive ' &
-         // ref // &
-         ' --format=' // archive_format // &
-         ' -o ' // destination , echo=verbose, exitstat=stat)
+    call run('git archive '//ref//' --format='//archive_format//' -o '//destination, echo=verbose, exitstat=stat)
     if (stat /= 0) then
       call fatal_error(error, "Error packing '"//source//"'."); return
     end if

diff --git a/src/fpm_compiler.F90 b/src/fpm_compiler.F90
@@ -310,7 +310,7 @@ subroutine get_release_compile_flags(id, flags)
 
     case(id_intel_classic_mac)
         flags = &
-          !  flag_intel_opt//&   ! commented to debug #980
+            flag_intel_opt//&
             flag_intel_fp//&
             flag_intel_align//&
             flag_intel_limit//&