Skip to content

Commit e00710a

Browse files
oleavrdcbaker
authored andcommitted
env2mfile: Only consume LDFLAGS for relevant languages
It makes no sense to add them into vala_link_args, for example.
1 parent 2d010c6 commit e00710a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

mesonbuild/scripts/env2mfile.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ def write_machine_file(infos: MachineInfo, ofilename: str, write_system_info: bo
273273
os.replace(tmpfilename, ofilename)
274274

275275
def detect_language_args_from_envvars(langname: str, envvar_suffix: str = '') -> T.Tuple[T.List[str], T.List[str]]:
276-
ldflags = tuple(shlex.split(os.environ.get('LDFLAGS' + envvar_suffix, '')))
277276
compile_args = []
278277
if langname in compilers.CFLAGS_MAPPING:
279278
compile_args = shlex.split(os.environ.get(compilers.CFLAGS_MAPPING[langname] + envvar_suffix, ''))
@@ -282,7 +281,10 @@ def detect_language_args_from_envvars(langname: str, envvar_suffix: str = '') ->
282281
lang_compile_args = list(cppflags) + compile_args
283282
else:
284283
lang_compile_args = compile_args
285-
lang_link_args = list(ldflags) + compile_args
284+
lang_link_args = []
285+
if langname in compilers.LANGUAGES_USING_LDFLAGS:
286+
lang_link_args += shlex.split(os.environ.get('LDFLAGS' + envvar_suffix, ''))
287+
lang_link_args += compile_args
286288
return (lang_compile_args, lang_link_args)
287289

288290
def detect_compilers_from_envvars(envvar_suffix: str = '') -> MachineInfo:

0 commit comments

Comments
 (0)