Merge remote-tracking branch 'upstream/main' into ifx_compile

Author: krystophny

src/fpm_compiler.F90

@@ -125,6 +125,7 @@ module fpm_compiler
     procedure :: load_from_toml => compiler_load
     !> Fortran feature support
     procedure :: check_fortran_source_runs
+    procedure :: check_flags_supported
     procedure :: with_xdp
     procedure :: with_qp
     !> Return compiler name
@@ -1452,14 +1453,16 @@ end function compiler_name
 
 !> Run a single-source Fortran program using the current compiler
 !> Compile a Fortran object
-logical function check_fortran_source_runs(self, input) result(success)
+logical function check_fortran_source_runs(self, input, compile_flags, link_flags) result(success)
     !> Instance of the compiler object
     class(compiler_t), intent(in) :: self
     !> Program Source
     character(len=*), intent(in) :: input
+    !> Optional build and link flags 
+    character(len=*), optional, intent(in) :: compile_flags, link_flags
 
     integer :: stat,unit
-    character(:), allocatable :: source,object,logf,exe
+    character(:), allocatable :: source,object,logf,exe,flags,ldflags
 
     success = .false.
 
@@ -1475,10 +1478,17 @@ logical function check_fortran_source_runs(self, input) result(success)
     write(unit,*) input
     close(unit)
 
+    !> Get flags
+    flags    = self%get_default_flags(release=.false.)
+    ldflags  = self%get_default_flags(release=.false.)
+    
+    if (present(compile_flags)) flags = flags//" "//compile_flags
+    if (present(link_flags)) ldflags = ldflags//" "//link_flags
+    
     !> Compile and link program
-    call self%compile_fortran(source, object, self%get_default_flags(release=.false.), logf, stat)
+    call self%compile_fortran(source, object, flags, logf, stat)
     if (stat==0) &
-    call self%link(exe, self%get_default_flags(release=.false.)//" "//object, logf, stat)
+    call self%link(exe, ldflags//" "//object, logf, stat)
 
     !> Run and retrieve exit code
     if (stat==0) &
@@ -1499,6 +1509,18 @@ logical function check_fortran_source_runs(self, input) result(success)
 
 end function check_fortran_source_runs
 
+!> Check if the given compile and/or link flags are accepted by the compiler
+logical function check_flags_supported(self, compile_flags, link_flags)
+    class(compiler_t), intent(in) :: self
+    character(len=*), optional, intent(in) :: compile_flags, link_flags
+
+    ! Minimal program that always compiles
+    character(len=*), parameter :: hello_world = "print *, 'Hello, World!'; end"
+
+    check_flags_supported = self%check_fortran_source_runs(hello_world, compile_flags, link_flags)
+    
+end function check_flags_supported
+
 !> Check if the current compiler supports 128-bit real precision
 logical function with_qp(self)
     !> Instance of the compiler object

src/metapackage/fpm_meta_netcdf.f90

@@ -39,13 +39,15 @@ subroutine init_netcdf(this, compiler, error)
 
         if (.not. pkgcfg_has_package('netcdf')) then
             call fatal_error(error, 'pkg-config could not find a suitable netcdf package.')
+            return
         end if
         call add_pkg_config_compile_options(this, 'netcdf', include_flag, libdir, error)
         if (allocated(error)) return
 
         if (.not. pkgcfg_has_package('netcdf-fortran')) then
             call fatal_error(error, &
                              'pkg-config could not find a suitable netcdf-fortran package.')
+            return
         end if
         call add_pkg_config_compile_options(this, 'netcdf-fortran', include_flag, libdir, error)
         if (allocated(error)) return

test/fpm_test/test_compiler.f90

@@ -51,6 +51,39 @@ subroutine test_check_fortran_source_runs(error)
             call test_failed(error, "Cannot run Fortran hello world")
             return
         end if
+        
+        !> Test with invalid flags 
+        if (compiler%check_fortran_source_runs("print *, 'Hello world!'; end", &
+                                               link_flags=" -some-really-invalid-link-flag")) then 
+            call test_failed(error, "Invalid link flags did not trigger an error")
+            return
+        end if              
+        if (compiler%check_fortran_source_runs("print *, 'Hello world!'; end", &
+                                               compile_flags=" -certainly-not-a-build/flag")) then 
+            call test_failed(error, "Invalid compile flags did not trigger an error")
+            return
+        end if                              
+        if (compiler%check_fortran_source_runs("print *, 'Hello world!'; end", &
+                                               compile_flags=" -certainly-not-a-build/flag", &
+                                               link_flags=" -some-really-invalid-link-flag")) then 
+            call test_failed(error, "Invalid build and link flags did not trigger an error")
+            return
+        end if           
+        
+        !> Test the flag check wrapper
+        if (compiler%check_flags_supported(compile_flags='-Werror=unknown-flag')) then
+            call test_failed(error, "Invalid compile flags did not trigger an error")
+            return
+        end if
+        if (compiler%check_flags_supported(link_flags='-Wl,--nonexistent-linker-option')) then
+            call test_failed(error, "Invalid link flags did not trigger an error")
+            return
+        end if
+        if (compiler%check_flags_supported(compile_flags='-Werror=unknown-flag', &
+                                           link_flags='-Wl,--nonexistent-linker-option')) then
+            call test_failed(error, "Invalid compile and link flags did not trigger an error")
+            return
+        end if
 
     end subroutine test_check_fortran_source_runs