Merge pull request #4178 from martin-frbg/llvm17
Add (gmake) support for LLVM17's new flang
This commit is contained in:
commit
8a171350db
|
@ -1087,8 +1087,9 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(F_COMPILER), GFORTRAN)
|
ifeq ($(F_COMPILER), $(filter $(F_COMPILER),GFORTRAN FLANGNEW))
|
||||||
CCOMMON_OPT += -DF_INTERFACE_GFORT
|
CCOMMON_OPT += -DF_INTERFACE_GFORT
|
||||||
|
ifeq ($(F_COMPILER), GFORTRAN)
|
||||||
FCOMMON_OPT += -Wall
|
FCOMMON_OPT += -Wall
|
||||||
# make single-threaded LAPACK calls thread-safe #1847
|
# make single-threaded LAPACK calls thread-safe #1847
|
||||||
FCOMMON_OPT += -frecursive
|
FCOMMON_OPT += -frecursive
|
||||||
|
@ -1102,6 +1103,7 @@ EXTRALIB += -lgfortran
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
ifdef NO_BINARY_MODE
|
ifdef NO_BINARY_MODE
|
||||||
ifeq ($(ARCH), $(filter $(ARCH),mips64))
|
ifeq ($(ARCH), $(filter $(ARCH),mips64))
|
||||||
ifdef BINARY64
|
ifdef BINARY64
|
||||||
|
|
9
f_check
9
f_check
|
@ -101,7 +101,14 @@ else
|
||||||
*flang*)
|
*flang*)
|
||||||
vendor=FLANG
|
vendor=FLANG
|
||||||
openmp='-fopenmp'
|
openmp='-fopenmp'
|
||||||
;;
|
data=`$compiler -v 2>&1 > /dev/null `
|
||||||
|
v="${data#*version *}"
|
||||||
|
v="${v%%*.}"
|
||||||
|
major="${v%%.*}"
|
||||||
|
if [ "$major" -ge 17 ]; then
|
||||||
|
vendor=FLANGNEW
|
||||||
|
fi
|
||||||
|
;;
|
||||||
*ifort*|*ifx*)
|
*ifort*|*ifx*)
|
||||||
vendor=INTEL
|
vendor=INTEL
|
||||||
openmp='-fopenmp'
|
openmp='-fopenmp'
|
||||||
|
|
Loading…
Reference in New Issue