Merge pull request #4304 from martin-frbg/issue4277

Move clang/gfortran OpenMP dependency rewriting out of f_check
2023-11-11 20:58:21 +01:00 · 2023-11-11 20:58:21 +01:00 · 9c3c1cfbd6
parent cad10a3caa 1a308a0066
commit 9c3c1cfbd6
2 changed files with 3 additions and 7 deletions
--- a/Makefile.system
+++ b/Makefile.system
@ -608,6 +608,9 @@ endif

 ifeq ($(C_COMPILER), CLANG)
 CCOMMON_OPT    += -fopenmp
+ifeq ($(F_COMPILER), GFORTRAN)
+FEXTRALIB := $(subst -lgomp,-lomp,$(FEXTRALIB))
+endif
 endif

 ifeq ($(C_COMPILER), INTEL)
--- a/7
+++ b/7
@ -373,13 +373,6 @@ if [ -n "$link" ]; then
    	    ;;
    	esac

-    	case "$flag" in *-lgomp*)
-    	    case "$CC" in *clang*)
-    	        flag="-lomp"
-    	        ;;
-    	    esac
-    	esac
-
        case "$flag" in -l*)
            case "$flag" in
                *ibrary*|*gfortranbegin*|*flangmain*|*frtbegin*|*pathfstart*|\