mirror of
https://github.com/mesonbuild/meson.git
synced 2026-11-06 05:16:42 +00:00
build: fix install name when using link_whole
This commit is contained in:
1 parent
ee89525b91
commit
dd2c4203e9
3 files changed
+8
-1
No files matched your search
+1
-1
@@ -1331,7 +1331,7 @@ class BuildTarget(Target):
|
||||
@lru_cache(maxsize=None)
|
||||
def get_transitive_link_deps_mapping(self, prefix: str) -> T.Mapping[str, str]:
|
||||
result: T.Dict[str, str] = {}
|
||||
for i in self.link_targets:
|
||||
for i in itertools.chain(self.link_targets, self.link_whole_targets):
|
||||
mapping = i.get_link_deps_mapping(prefix)
|
||||
#we are merging two dictionaries, while keeping the earlier one dominant
|
||||
result_tmp = mapping.copy()
|
||||
|
||||
@@ -15,3 +15,8 @@ main = executable('main', 'main.c',
|
||||
link_with: bar_internal,
|
||||
install: true,
|
||||
)
|
||||
|
||||
main_whole = executable('main-whole', 'main.c',
|
||||
link_whole: bar_internal,
|
||||
install: true,
|
||||
)
|
||||
@@ -182,6 +182,8 @@ class DarwinTests(BasePlatformTests):
|
||||
self.assertListEqual(rpaths, [])
|
||||
libs = self._get_darwin_rpath_libraries(os.path.join(self.installdir, 'usr/bin/main'))
|
||||
self.assertListEqual(libs, [])
|
||||
libs = self._get_darwin_rpath_libraries(os.path.join(self.installdir, 'usr/bin/main-whole'))
|
||||
self.assertListEqual(libs, [])
|
||||
|
||||
@skip_if_not_language('rust')
|
||||
def test_rust_apple_framework_rlib(self):
|
||||
|
||||
Reference in new issue
Block a user