Skip to content

Commit fa3f7e1

Browse files
committed
Revert "linkers: darwin: do not use -bundle for shared_modules"
This reverts commit d0d7af3. This patch should not have been backported but was added to the milestone by accident. It's a risky change. It also broke building postgres on macOS. See: #14340 (comment) And discussion of a better fix: #14444 (comment) #14444 (comment)
1 parent a19332f commit fa3f7e1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

docs/markdown/Builtin-options.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,8 @@ with `b_asneeded`, so that option will be silently disabled.
257257

258258
[[shared_module]]s will not have
259259
bitcode embedded because `-Wl,-bitcode_bundle` is incompatible with
260-
`-Wl,-undefined,dynamic_lookup` which is necessary for shared modules to work.
260+
both `-bundle` and `-Wl,-undefined,dynamic_lookup` which are necessary
261+
for shared modules to work.
261262

262263
## Compiler options
263264

mesonbuild/linkers/linkers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ def get_allow_undefined_args(self) -> T.List[str]:
795795
return self._apply_prefix('-undefined,dynamic_lookup')
796796

797797
def get_std_shared_module_args(self, options: 'KeyedOptionDictType') -> T.List[str]:
798-
return ['-dynamiclib'] + self._apply_prefix('-undefined,dynamic_lookup')
798+
return ['-bundle'] + self._apply_prefix('-undefined,dynamic_lookup')
799799

800800
def get_pie_args(self) -> T.List[str]:
801801
return []

0 commit comments

Comments
 (0)