@@ -70,7 +70,7 @@ module fpm_compiler
70
70
id_nvhpc, &
71
71
id_nag, &
72
72
id_flang_classic, &
73
- id_flang_new , &
73
+ id_flang , &
74
74
id_f18, &
75
75
id_ibmxl, &
76
76
id_cray, &
@@ -614,7 +614,7 @@ function get_include_flag(self, path) result(flags)
614
614
flags = " -I " // path
615
615
616
616
case (id_caf, id_gcc, id_f95, id_cray, id_nvhpc, id_pgi, &
617
- & id_flang_classic, id_flang_new , id_f18, &
617
+ & id_flang_classic, id_flang , id_f18, &
618
618
& id_intel_classic_nix, id_intel_classic_mac, &
619
619
& id_intel_llvm_nix, id_lahey, id_nag, id_ibmxl, &
620
620
& id_lfortran)
@@ -641,7 +641,7 @@ function get_module_flag(self, path) result(flags)
641
641
case (id_nvhpc, id_pgi, id_flang_classic)
642
642
flags = " -module " // path
643
643
644
- case (id_flang_new , id_f18)
644
+ case (id_flang , id_f18)
645
645
flags = " -module-dir " // path
646
646
647
647
case (id_intel_classic_nix, id_intel_classic_mac, &
@@ -734,6 +734,7 @@ function get_feature_flag(self, feature) result(flags)
734
734
end select
735
735
736
736
case (" free-form" )
737
+
737
738
select case (self% id)
738
739
case (id_caf, id_gcc, id_f95)
739
740
flags = flag_gnu_free_form
@@ -849,7 +850,7 @@ subroutine get_default_c_compiler(f_compiler, c_compiler)
849
850
case (id_intel_llvm_nix,id_intel_llvm_windows)
850
851
c_compiler = ' icx'
851
852
852
- case (id_flang_classic, id_flang_new , id_f18)
853
+ case (id_flang_classic, id_flang , id_f18)
853
854
c_compiler= ' clang'
854
855
855
856
case (id_ibmxl)
@@ -884,7 +885,7 @@ subroutine get_default_cxx_compiler(f_compiler, cxx_compiler)
884
885
case (id_intel_llvm_nix,id_intel_llvm_windows)
885
886
cxx_compiler = ' icpx'
886
887
887
- case (id_flang_classic, id_flang_new , id_f18)
888
+ case (id_flang_classic, id_flang , id_f18)
888
889
cxx_compiler= ' clang++'
889
890
890
891
case (id_ibmxl)
@@ -997,18 +998,18 @@ function get_id(compiler) result(id)
997
998
return
998
999
end if
999
1000
1000
- if (check_compiler(compiler, " flang-new " )) then
1001
- id = id_flang_new
1001
+ if (check_compiler(compiler, " flang-classic " )) then
1002
+ id = id_flang_classic
1002
1003
return
1003
1004
end if
1004
1005
1005
- if (check_compiler(compiler, " f18 " )) then
1006
- id = id_f18
1006
+ if (check_compiler(compiler, " flang-new " ) .or. check_compiler(compiler, " flang " )) then
1007
+ id = id_flang
1007
1008
return
1008
1009
end if
1009
1010
1010
- if (check_compiler(compiler, " flang " )) then
1011
- id = id_flang_classic
1011
+ if (check_compiler(compiler, " f18 " )) then
1012
+ id = id_f18
1012
1013
return
1013
1014
end if
1014
1015
@@ -1752,8 +1753,8 @@ pure function compiler_name(self) result(name)
1752
1753
case (id_pgi); name = " pgfortran"
1753
1754
case (id_nvhpc); name = " nvfortran"
1754
1755
case (id_nag); name = " nagfor"
1755
- case (id_flang_classic); name = " flang"
1756
- case (id_flang_new ); name = " flang-new "
1756
+ case (id_flang_classic); name = " flang-classic "
1757
+ case (id_flang ); name = " flang"
1757
1758
case (id_f18); name = " f18"
1758
1759
case (id_ibmxl); name = " xlf90"
1759
1760
case (id_cray); name = " crayftn"
0 commit comments