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

WIP: Fortran dialects default FLAGS and PATH if not set #4688

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Fortran dialects default FLAGS and PATH if not set #4688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7efb8ce
Fortran dialects default FLAGS and PATH if not set
mwichmann Feb 26, 2025
dc48d37
Fix Fortran dialect FLAGS default
mwichmann Feb 26, 2025
a620646
Update documentation for F90 dialect [skip ci]
mwichmann Feb 27, 2025
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
5 changes: 4 additions & 1 deletion CHANGES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
Includes code embedded in docstrings.
- Handle case of "memoizer" as one member of a comma-separated
--debug string - this was previously missed.
- test YACC/live.py fixed - finally started failing on an "old-style"
- test YACC/live.py fixed - gcc 15 failed this on an "old-style"
(K&R flavor) function declaration, updated.
- Fortran dialect *PATH and *FLAGS settings fall back to generic
dialect's settings if not explicitly set, bringing the behavior in line
with long-standing documentation claims.

From Adam Scott:
- Changed Ninja's TEMPLATE rule pool to use `install_pool` instead of
Expand Down
5 changes: 5 additions & 0 deletions RELEASE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,11 @@ FIXES
- Handle case of "memoizer" as one member of a comma-separated
--debug string - this was previously missed.

- Fortran dialect *PATH and *FLAGS settings fall back to generic
dialect's settings if not explicitly set, bringing the behavior in line
with long-standing documentation claims.


IMPROVEMENTS
------------

Expand Down
25 changes: 14 additions & 11 deletions SCons/Tool/FortranCommon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,20 @@ def DialectAddToEnv(
"""
ComputeFortranSuffixes(suffixes, ppsuffixes)

defaults = {}
# Dialect-specific variables that should fall back to FORTRAN dialect:
if dialect == 'FORTRAN':
defaults[f'{dialect}FLAGS'] = SCons.Util.CLVar('')
defaults[f'SH{dialect}FLAGS'] = SCons.Util.CLVar(f'${dialect}FLAGS')
else:
defaults[f'{dialect}PATH'] = '$FORTRANPATH'
defaults[f'{dialect}FLAGS'] = SCons.Util.CLVar('$FORTRANFLAGS')
defaults[f'SH{dialect}FLAGS'] = SCons.Util.CLVar('$SHFORTRANFLAGS')
# Variables that should fall back to the C version:
defaults[f'INC{dialect}PREFIX'] = '$INCPREFIX'
defaults[f'INC{dialect}SUFFIX'] = '$INCSUFFIX'
env.SetDefault(**defaults)

fscan = SCons.Scanner.Fortran.FortranScan(f"{dialect}PATH")
for suffix in suffixes + ppsuffixes:
SCons.Tool.SourceFileScanner.add_scanner(suffix, fscan)
Expand All @@ -168,17 +182,6 @@ def DialectAddToEnv(
static_obj.add_emitter(suffix, FortranEmitter)
shared_obj.add_emitter(suffix, ShFortranEmitter)

if f'{dialect}FLAGS' not in env:
env[f'{dialect}FLAGS'] = SCons.Util.CLVar('')
if f'SH{dialect}FLAGS' not in env:
env[f'SH{dialect}FLAGS'] = SCons.Util.CLVar(f'${dialect}FLAGS')

# If a tool does not define fortran prefix/suffix for include path, use C ones
if f'INC{dialect}PREFIX' not in env:
env[f'INC{dialect}PREFIX'] = '$INCPREFIX'
if f'INC{dialect}SUFFIX' not in env:
env[f'INC{dialect}SUFFIX'] = '$INCSUFFIX'

env[f'_{dialect}INCFLAGS'] = f'${{_concat(INC{dialect}PREFIX, {dialect}PATH, INC{dialect}SUFFIX, __env__, RDirs, TARGET, SOURCE, affect_signature=False)}}'

if support_mods:
Expand Down
Loading