Skip to content

Commit d5ce926

Browse files
committed
MAINT: Be more robust wrt f2py flags
1 parent d982cfa commit d5ce926

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

numpy/f2py/_backends/_meson.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ def _prepare_sources(mname, sources, bdir):
223223
def _get_flags(fc_flags):
224224
flag_values = []
225225
flag_pattern = re.compile(r"--f(77|90)flags=(.*)")
226-
227226
for flag in fc_flags:
228227
match_result = flag_pattern.match(flag)
229228
if match_result:
230229
values = match_result.group(2).strip().split()
230+
values = [val.strip("'\"") for val in values]
231231
flag_values.extend(values)
232232
# Hacky way to preserve order of flags
233233
unique_flags = list(dict.fromkeys(flag_values))

numpy/f2py/f2py2e.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,7 @@ def run_compile():
635635
r'--((f(90)?compiler(-exec|)|compiler)=|help-compiler)')
636636
flib_flags = [_m for _m in sys.argv[1:] if _reg3.match(_m)]
637637
sys.argv = [_m for _m in sys.argv if _m not in flib_flags]
638+
# TODO: Once distutils is dropped completely, i.e. min_ver >= 3.12, unify into --fflags
638639
reg_f77_f90_flags = re.compile(r'--f(77|90)flags=')
639640
reg_distutils_flags = re.compile(r'--((f(77|90)exec|opt|arch)=|(debug|noopt|noarch|help-fcompiler))')
640641
fc_flags = [_m for _m in sys.argv[1:] if reg_f77_f90_flags.match(_m)]

numpy/f2py/tests/test_regression.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ def test_gh25784():
130130
[util.getpath("tests", "src", "regression", "f77fixedform.f95")],
131131
options=[
132132
# Meson will collect and dedup these to pass to fortran_args:
133-
"--f77flags='-ffixed-form'",
134-
"--f90flags='-ffixed-form'",
133+
"--f77flags='-ffixed-form -O2'",
134+
"--f90flags=\"-ffixed-form -Og\"",
135135
],
136136
module_name="Blah",
137137
)

0 commit comments

Comments
 (0)