Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: add wait when linking library with *.resp file #808

Merged
merged 4 commits into from
Feb 22, 2023
+18 −7
Merged

Fix: add wait when linking library with *.resp file #808

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2525343
Fix: returns iostat for delete_file, but does not process it.
zoziha Dec 5, 2022
895860c
Fix: iostat of close is not optional
zoziha Dec 6, 2022
9684dd8
Use delete_file_win32
zoziha Feb 12, 2023
04a88b9
GFortran does not define _Win32 macro
zoziha Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/fpm_compiler.f90 → src/fpm_compiler.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,9 +937,9 @@ end subroutine link


!> Create an archive
!> @todo An OMP critical section is added for Windows OS,
!> which may be related to a bug in Mingw64-openmp and is expected to be resolved in the future,
!> see issue #707 and #708.
!> @todo For Windows OS, use the local `delete_file_win32` in stead of `delete_file`.
!> This may be related to a bug in Mingw64-openmp and is expected to be resolved in the future,
!> see issue #707, #708 and #808.
subroutine make_archive(self, output, args, log_file, stat)
!> Instance of the archiver object
class(archiver_t), intent(in) :: self
Expand All @@ -953,16 +953,27 @@ subroutine make_archive(self, output, args, log_file, stat)
integer, intent(out) :: stat

if (self%use_response_file) then
!$omp critical
call write_response_file(output//".resp" , args)
call run(self%ar // output // " @" // output//".resp", echo=self%echo, &
& verbose=self%verbose, redirect=log_file, exitstat=stat)
call delete_file(output//".resp")
!$omp end critical
call delete_file_win32(output//".resp")

else
call run(self%ar // output // " " // string_cat(args, " "), &
& echo=self%echo, verbose=self%verbose, redirect=log_file, exitstat=stat)
end if

contains
subroutine delete_file_win32(file)
character(len=*), intent(in) :: file
logical :: exist
integer :: unit, iostat
inquire(file=file, exist=exist)
if (exist) then
open(file=file, newunit=unit)
close(unit, status='delete', iostat=iostat)
end if
end subroutine delete_file_win32
end subroutine make_archive


Expand All @@ -976,7 +987,7 @@ subroutine write_response_file(name, argv)

integer :: iarg, io

open(file=name, newunit=io)
open(file=name, newunit=io, status='replace')
do iarg = 1, size(argv)
write(io, '(a)') unix_path(argv(iarg)%s)
end do
Expand Down