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

Allow setting, archiver, C compiler flags and linker flags from commandline #549

Merged
merged 5 commits into from
Sep 23, 2021
Merged

Allow setting, archiver, C compiler flags and linker flags from commandline #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9bc3b78
Use environment variables for Fortran compiler and arguments
awvwgk Aug 28, 2021
ec88660
Allow usage of --c-flag / CFLAGS and --link-flag / LDFLAGS
awvwgk Aug 29, 2021
b7f8736
Use both plain and FPM_ prefixed variables
awvwgk Aug 30, 2021
a53eb7c
Only use FPM_ prefixed environment variables
awvwgk Aug 30, 2021
feeefaf
Merge branch 'main' into env-vars
awvwgk Sep 23, 2021
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
13 changes: 9 additions & 4 deletions src/fpm.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ subroutine build_model(model, settings, package, error)

integer :: i, j
type(package_config_t) :: dependency
character(len=:), allocatable :: manifest, lib_dir, flags
character(len=:), allocatable :: manifest, lib_dir, flags, cflags, ldflags

logical :: duplicates_found = .false.
type(string_t) :: include_dir
Expand All @@ -60,8 +60,8 @@ subroutine build_model(model, settings, package, error)
call filewrite(join_path("build", ".gitignore"),["*"])
end if

call new_compiler(model%compiler, settings%compiler)
call new_archiver(model%archiver)
call new_compiler(model%compiler, settings%compiler, settings%c_compiler)
call new_archiver(model%archiver, settings%archiver)

if (settings%flag == '') then
flags = model%compiler%get_default_flags(settings%profile == "release")
Expand All @@ -73,7 +73,10 @@ subroutine build_model(model, settings, package, error)
end select
end if

write(build_name, '(z16.16)') fnv_1a(flags)
cflags = trim(settings%cflag)
ldflags = trim(settings%ldflag)

write(build_name, '(z16.16)') fnv_1a(flags//cflags//ldflags)

if (model%compiler%is_unknown()) then
write(*, '(*(a:,1x))') &
Expand Down Expand Up @@ -197,6 +200,8 @@ subroutine build_model(model, settings, package, error)
write(*,*)'<INFO> COMPILER: ',model%compiler%fc
write(*,*)'<INFO> C COMPILER: ',model%compiler%cc
write(*,*)'<INFO> COMPILER OPTIONS: ', model%fortran_compile_flags
write(*,*)'<INFO> C COMPILER OPTIONS: ', model%c_compile_flags
write(*,*)'<INFO> LINKER OPTIONS: ', model%link_flags
write(*,*)'<INFO> INCLUDE DIRECTORIES: [', string_cat(model%include_dirs,','),']'
end if

Expand Down
Loading