Skip to content

Commit 32401f1

Browse files
authored
Update module output directory command for flang-new/f18 (#645)
1 parent d99ad59 commit 32401f1

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

src/fpm_compiler.f90

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ module fpm_compiler
6161
id_nvhpc, &
6262
id_nag, &
6363
id_flang, &
64+
id_flang_new, &
65+
id_f18, &
6466
id_ibmxl, &
6567
id_cray, &
6668
id_lahey, &
@@ -380,7 +382,8 @@ function get_include_flag(self, path) result(flags)
380382
case default
381383
flags = "-I "//path
382384

383-
case(id_caf, id_gcc, id_f95, id_cray, id_nvhpc, id_pgi, id_flang, &
385+
case(id_caf, id_gcc, id_f95, id_cray, id_nvhpc, id_pgi, &
386+
& id_flang, id_flang_new, id_f18, &
384387
& id_intel_classic_nix, id_intel_classic_mac, &
385388
& id_intel_llvm_nix, id_lahey, id_nag, id_ibmxl, &
386389
& id_lfortran)
@@ -407,6 +410,9 @@ function get_module_flag(self, path) result(flags)
407410
case(id_nvhpc, id_pgi, id_flang)
408411
flags = "-module "//path
409412

413+
case(id_flang_new, id_f18)
414+
flags = "-module-dir "//path
415+
410416
case(id_intel_classic_nix, id_intel_classic_mac, &
411417
& id_intel_llvm_nix)
412418
flags = "-module "//path
@@ -443,7 +449,7 @@ subroutine get_default_c_compiler(f_compiler, c_compiler)
443449
case(id_intel_llvm_nix,id_intel_llvm_windows)
444450
c_compiler = 'icx'
445451

446-
case(id_flang)
452+
case(id_flang, id_flang_new, id_f18)
447453
c_compiler='clang'
448454

449455
case(id_ibmxl)
@@ -558,6 +564,16 @@ function get_id(compiler) result(id)
558564
return
559565
end if
560566

567+
if (check_compiler(compiler, "flang-new")) then
568+
id = id_flang_new
569+
return
570+
end if
571+
572+
if (check_compiler(compiler, "f18")) then
573+
id = id_f18
574+
return
575+
end if
576+
561577
if (check_compiler(compiler, "flang")) then
562578
id = id_flang
563579
return

0 commit comments

Comments
 (0)