always prune empty libraries

Author: perazz

bin/fpm

@@ -1,5 +1,5 @@
 # App only, use shared lib from other folder
-name = "shared_app_only"
+name = "static_app_only"
 library.type="static"
 install.library=true
 [dependencies]

example_packages/static_app_only/fpm.toml

@@ -270,7 +270,7 @@ subroutine targets_from_sources(targets,model,prune,library,error)
     should_prune = prune
     if (present(library)) should_prune = should_prune .and. library%monolithic()
 
-    if (should_prune) call prune_build_targets(targets,root_package=model%package_name)
+    call prune_build_targets(targets,model%package_name,should_prune)
 
     call resolve_target_linking(targets,model,library,error)
     if (allocated(error)) return
@@ -737,13 +737,16 @@ end function find_module_dependency
 
 
 !> Perform tree-shaking to remove unused module targets
-subroutine prune_build_targets(targets, root_package)
+subroutine prune_build_targets(targets, root_package, prune_unused_objects)
 
     !> Build target list to prune
     type(build_target_ptr), intent(inout), allocatable :: targets(:)
 
     !> Name of root package
     character(*), intent(in) :: root_package
+    
+    !> Whether unused objects should be pruned
+    logical, intent(in) :: prune_unused_objects
 
     integer :: i, j, nexec
     type(string_t), allocatable :: modules_used(:)
@@ -805,8 +808,8 @@ subroutine prune_build_targets(targets, root_package)
             if (allocated(target%source)) then
                 if (target%source%unit_type == FPM_UNIT_MODULE) then
 
-                    exclude_target(i) = .true.
-                    target%skip = .true.
+                    exclude_target(i) = prune_unused_objects
+                    target%skip = prune_unused_objects
 
                     do j=1,size(target%source%modules_provided)
 
@@ -822,8 +825,8 @@ subroutine prune_build_targets(targets, root_package)
                 elseif (target%source%unit_type == FPM_UNIT_SUBMODULE) then
                     ! Remove submodules if their parents are not used
 
-                    exclude_target(i) = .true.
-                    target%skip = .true.
+                    exclude_target(i) = prune_unused_objects
+                    target%skip = prune_unused_objects
                     do j=1,size(target%source%parent_modules)
 
                         if (target%source%parent_modules(j)%s .in. modules_used) then
@@ -1106,8 +1109,8 @@ subroutine resolve_target_linking(targets, model, library, error)
                         has_self_lib = .false.
                         find_self: do j=1,size(targets)
                             associate(target_loop=>targets(j)%ptr)
-                                if (target_loop%target_type==FPM_TARGET_SHARED .and. &
-                                    target_loop%package_name==target%package_name) then 
+                                if (any(target_loop%target_type==[FPM_TARGET_SHARED,FPM_TARGET_ARCHIVE]) &
+                                    .and. target_loop%package_name==target%package_name) then 
                                     has_self_lib = .true.
                                     exit find_self
                                 end if