diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-06 21:08:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 21:08:54 +0200 |
| commit | e98ae58d0e40a15ae670d456e0c27057b4b2185b (patch) | |
| tree | c688f5db0e57513082ed368e9ed1ea6131f96bb3 /mesonbuild/build.py | |
| parent | 19718a8d9c5cb6d9ac2c2cbb5459178906a3a007 (diff) | |
| parent | 4de02cb5b0e67e051b8503a94249d21989844e87 (diff) | |
| download | meson-e98ae58d0e40a15ae670d456e0c27057b4b2185b.zip meson-e98ae58d0e40a15ae670d456e0c27057b4b2185b.tar.gz meson-e98ae58d0e40a15ae670d456e0c27057b4b2185b.tar.bz2 | |
Merge pull request #3086 from sarum9in/declare-link-whole
Add declare_dependency() link_whole parameter
Diffstat (limited to 'mesonbuild/build.py')
| -rw-r--r-- | mesonbuild/build.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 9eb74e9..d162e60 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -838,12 +838,14 @@ This will become a hard error in a future Meson release.''') self.add_include_dirs(dep.include_directories) for l in dep.libraries: self.link(l) + for l in dep.whole_libraries: + self.link_whole(l) # Those parts that are external. extpart = dependencies.InternalDependency('undefined', [], dep.compile_args, dep.link_args, - [], [], []) + [], [], [], []) self.external_deps.append(extpart) # Deps of deps. self.add_deps(dep.ext_deps) |