floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4304 from martin-frbg/issue4277 

Move clang/gfortran OpenMP dependency rewriting out of f_check
This commit is contained in:
Martin Kroeker 2023-11-11 20:58:21 +01:00 committed by GitHub
parent cad10a3caa 1a308a0066
commit 9c3c1cfbd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.system
View File

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

7
f_check
View File

@ -373,13 +373,6 @@ if [ -n "$link" ]; then
;; ;;
esac esac
case "$flag" in *-lgomp*)
case "$CC" in *clang*)
flag="-lomp"
;;
esac
esac
case "$flag" in -l*) case "$flag" in -l*)
case "$flag" in case "$flag" in
*ibrary*|*gfortranbegin*|*flangmain*|*frtbegin*|*pathfstart*|\ *ibrary*|*gfortranbegin*|*flangmain*|*frtbegin*|*pathfstart*|\