diff options
| author | Ole André Vadla Ravnås <oleavr@gmail.com> | 2024-04-04 14:53:47 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2024-04-04 09:35:22 -0700 |
| commit | e00710a0a98e818418a62466284bdfc200142b0c (patch) | |
| tree | 005275712b1acfbf34ca34b34534255be7d66d96 | |
| parent | 2d010c693b97694a82458ba89d4da569e21c60aa (diff) | |
| download | meson-e00710a0a98e818418a62466284bdfc200142b0c.tar.gz | |
env2mfile: Only consume LDFLAGS for relevant languages
It makes no sense to add them into vala_link_args, for example.
| -rwxr-xr-x | mesonbuild/scripts/env2mfile.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/scripts/env2mfile.py b/mesonbuild/scripts/env2mfile.py index 2dfe6b05e..bc0101e26 100755 --- a/mesonbuild/scripts/env2mfile.py +++ b/mesonbuild/scripts/env2mfile.py @@ -273,7 +273,6 @@ def write_machine_file(infos: MachineInfo, ofilename: str, write_system_info: bo os.replace(tmpfilename, ofilename) def detect_language_args_from_envvars(langname: str, envvar_suffix: str = '') -> T.Tuple[T.List[str], T.List[str]]: - ldflags = tuple(shlex.split(os.environ.get('LDFLAGS' + envvar_suffix, ''))) compile_args = [] if langname in compilers.CFLAGS_MAPPING: 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 = '') -> lang_compile_args = list(cppflags) + compile_args else: lang_compile_args = compile_args - lang_link_args = list(ldflags) + compile_args + lang_link_args = [] + if langname in compilers.LANGUAGES_USING_LDFLAGS: + lang_link_args += shlex.split(os.environ.get('LDFLAGS' + envvar_suffix, '')) + lang_link_args += compile_args return (lang_compile_args, lang_link_args) def detect_compilers_from_envvars(envvar_suffix: str = '') -> MachineInfo: |