Skip to content

Commit 8a17135

Browse files
authored
Merge pull request #4178 from martin-frbg/llvm17
Add (gmake) support for LLVM17's new flang
2 parents ef23240 + e8bc8a0 commit 8a17135

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Makefile.system

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,8 +1087,9 @@ endif
10871087
endif
10881088
endif
10891089

1090-
ifeq ($(F_COMPILER), GFORTRAN)
1090+
ifeq ($(F_COMPILER), $(filter $(F_COMPILER),GFORTRAN FLANGNEW))
10911091
CCOMMON_OPT += -DF_INTERFACE_GFORT
1092+
ifeq ($(F_COMPILER), GFORTRAN)
10921093
FCOMMON_OPT += -Wall
10931094
# make single-threaded LAPACK calls thread-safe #1847
10941095
FCOMMON_OPT += -frecursive
@@ -1102,6 +1103,7 @@ EXTRALIB += -lgfortran
11021103
endif
11031104
endif
11041105
endif
1106+
endif
11051107
ifdef NO_BINARY_MODE
11061108
ifeq ($(ARCH), $(filter $(ARCH),mips64))
11071109
ifdef BINARY64

f_check

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,14 @@ else
101101
*flang*)
102102
vendor=FLANG
103103
openmp='-fopenmp'
104-
;;
104+
data=`$compiler -v 2>&1 > /dev/null `
105+
v="${data#*version *}"
106+
v="${v%%*.}"
107+
major="${v%%.*}"
108+
if [ "$major" -ge 17 ]; then
109+
vendor=FLANGNEW
110+
fi
111+
;;
105112
*ifort*|*ifx*)
106113
vendor=INTEL
107114
openmp='-fopenmp'

0 commit comments

Comments
 (0)