Skip to content

Commit 4b8521d

Browse files
committed
fix(fpm_compiler): name id_flang->id_flang_classic
Due to the ambiguity of the compiler name flang, this commit replaces all occurrences of id_flang with id_flang_classic to disambiguate LLVM Flang and Classic Flang.
1 parent e9f9476 commit 4b8521d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/fpm_compiler.F90

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ module fpm_compiler
6969
id_pgi, &
7070
id_nvhpc, &
7171
id_nag, &
72-
id_flang, &
72+
id_flang_classic, &
7373
id_flang_new, &
7474
id_f18, &
7575
id_ibmxl, &
@@ -614,7 +614,7 @@ function get_include_flag(self, path) result(flags)
614614
flags = "-I "//path
615615

616616
case(id_caf, id_gcc, id_f95, id_cray, id_nvhpc, id_pgi, &
617-
& id_flang, id_flang_new, id_f18, &
617+
& id_flang_classic, id_flang_new, id_f18, &
618618
& id_intel_classic_nix, id_intel_classic_mac, &
619619
& id_intel_llvm_nix, id_lahey, id_nag, id_ibmxl, &
620620
& id_lfortran)
@@ -638,7 +638,7 @@ function get_module_flag(self, path) result(flags)
638638
case(id_caf, id_gcc, id_f95, id_cray, id_lfortran)
639639
flags = "-J "//path
640640

641-
case(id_nvhpc, id_pgi, id_flang)
641+
case(id_nvhpc, id_pgi, id_flang_classic)
642642
flags = "-module "//path
643643

644644
case(id_flang_new, id_f18)
@@ -738,7 +738,7 @@ function get_feature_flag(self, feature) result(flags)
738738
case(id_caf, id_gcc, id_f95)
739739
flags = flag_gnu_free_form
740740

741-
case(id_pgi, id_nvhpc, id_flang)
741+
case(id_pgi, id_nvhpc, id_flang_classic)
742742
flags = flag_pgi_free_form
743743

744744
case(id_nag)
@@ -761,7 +761,7 @@ function get_feature_flag(self, feature) result(flags)
761761
case(id_caf, id_gcc, id_f95)
762762
flags = flag_gnu_fixed_form
763763

764-
case(id_pgi, id_nvhpc, id_flang)
764+
case(id_pgi, id_nvhpc, id_flang_classic)
765765
flags = flag_pgi_fixed_form
766766

767767
case(id_nag)
@@ -849,7 +849,7 @@ subroutine get_default_c_compiler(f_compiler, c_compiler)
849849
case(id_intel_llvm_nix,id_intel_llvm_windows)
850850
c_compiler = 'icx'
851851

852-
case(id_flang, id_flang_new, id_f18)
852+
case(id_flang_classic, id_flang_new, id_f18)
853853
c_compiler='clang'
854854

855855
case(id_ibmxl)
@@ -884,7 +884,7 @@ subroutine get_default_cxx_compiler(f_compiler, cxx_compiler)
884884
case(id_intel_llvm_nix,id_intel_llvm_windows)
885885
cxx_compiler = 'icpx'
886886

887-
case(id_flang, id_flang_new, id_f18)
887+
case(id_flang_classic, id_flang_new, id_f18)
888888
cxx_compiler='clang++'
889889

890890
case(id_ibmxl)
@@ -1008,7 +1008,7 @@ function get_id(compiler) result(id)
10081008
end if
10091009

10101010
if (check_compiler(compiler, "flang")) then
1011-
id = id_flang
1011+
id = id_flang_classic
10121012
return
10131013
end if
10141014

@@ -1752,7 +1752,7 @@ pure function compiler_name(self) result(name)
17521752
case(id_pgi); name = "pgfortran"
17531753
case(id_nvhpc); name = "nvfortran"
17541754
case(id_nag); name = "nagfor"
1755-
case(id_flang); name = "flang"
1755+
case(id_flang_classic); name = "flang"
17561756
case(id_flang_new); name = "flang-new"
17571757
case(id_f18); name = "f18"
17581758
case(id_ibmxl); name = "xlf90"

0 commit comments

Comments
 (0)