diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2021-07-30 11:07:03 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-09-25 00:18:22 +0300 |
| commit | 64c267c49c785a204730ca28141f1fe34bc1827a (patch) | |
| tree | ca841d7940372425d499f955c06519aa1216b6f0 /mesonbuild/build.py | |
| parent | fee5cb697c77156f0dec4264ce846dd0d4f84fd5 (diff) | |
| download | meson-64c267c49c785a204730ca28141f1fe34bc1827a.zip meson-64c267c49c785a204730ca28141f1fe34bc1827a.tar.gz meson-64c267c49c785a204730ca28141f1fe34bc1827a.tar.bz2 | |
compilers: Add default search path stdlib_only_link_flags
This should be done in all cases of language_stdlib_only_link_flags, but
I don't have access to all of the compilers to test it.
This is required in cases where object files created by gfortran are
linked using another compiler with a differen default search path, such
as gfortran and clang together.
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 2ee2d4a..98385df 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1470,7 +1470,7 @@ You probably should put it in link_with instead.''') # If the user set the link_language, just return that. if self.link_language: comp = all_compilers[self.link_language] - return comp, comp.language_stdlib_only_link_flags() + return comp, comp.language_stdlib_only_link_flags(self.environment) # Languages used by dependencies dep_langs = self.get_langs_used_by_deps() @@ -1488,7 +1488,7 @@ You probably should put it in link_with instead.''') added_languages: T.Set[str] = set() for dl in itertools.chain(self.compilers, dep_langs): if dl != linker.language: - stdlib_args += all_compilers[dl].language_stdlib_only_link_flags() + stdlib_args += all_compilers[dl].language_stdlib_only_link_flags(self.environment) added_languages.add(dl) # Type of var 'linker' is Compiler. # Pretty hard to fix because the return value is passed everywhere |