diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2023-09-29 14:10:42 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-10-06 11:49:47 +0200 |
| commit | 302a44fe5a3ab3d0d0c95f356c03aef88ad779ab (patch) | |
| tree | 0e26ca5073f85723bd350b321bde5d776d5a1844 | |
| parent | 2819bdf9a9abfd31ca33b504183cf141cc52a8c9 (diff) | |
remove obsolete -single_module linker flag (is the default)
has already been unnecessary since over 15 years/was the default since
OS X 10.4 (2005) along with ignoring the corresponding altenative
(-multi_module) switch, from man ld:
-single_module
This is now the default so does not need to be specified.
-multi_module
Multi-modules in dynamic libraries have been ignored at runtime
since Mac OS X 10.4.0. This option is obsolete.
Xcode 15 now warns about it being obsolete, so remove it.
Change-Id: I4d4aab452a330c3c4ec97da4232c3af6350c0ff4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157407
Tested-by: Jenkins
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit d821ebd7a28204b82bb40a7b97414de95835c05d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157541
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | odk/settings/settings.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ce490b8c6f09..b0001ebbf126 100644 --- a/configure.ac +++ b/configure.ac @@ -998,7 +998,7 @@ darwin*) # macOS INSTROOTCONTENTSUFFIX=/Contents SDKDIRNAME=${PRODUCTNAME_WITHOUT_SPACES}${PRODUCTVERSION}_SDK # See "Default values, as such probably valid just for Linux" comment above the case "$host_os" - LINKFLAGSSHL="-dynamiclib -single_module" + LINKFLAGSSHL="-dynamiclib" # -fPIC is default PICSWITCH="" @@ -1039,7 +1039,7 @@ ios*) # iOS host=x86_64-apple-darwin fi # See "Default values, as such probably valid just for Linux" comment above the case "$host_os" - LINKFLAGSSHL="-dynamiclib -single_module" + LINKFLAGSSHL="-dynamiclib" # -fPIC is default PICSWITCH="" diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 25e5cb4af4b4..13289c96db6e 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -469,7 +469,7 @@ CC_OUTPUT_SWITCH=-o LIBO_SDK_LDFLAGS_STDLIBS = -LIBRARY_LINK_FLAGS=-dynamiclib -single_module -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION) +LIBRARY_LINK_FLAGS=-dynamiclib -Wl,-multiply_defined,suppress $(GCC_ARCH_OPTION) # install_name '@executable_path$/(@:f)' COMP_LINK_FLAGS=$(LIBRARY_LINK_FLAGS) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index f1491b1117cf..be25f6563cd0 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -177,7 +177,7 @@ endef # Library class gb_Library_DEFS := -gb_Library_TARGETTYPEFLAGS := -dynamiclib -single_module +gb_Library_TARGETTYPEFLAGS := -dynamiclib gb_Bundle_TARGETTYPEFLAGS := -bundle gb_Library_UDK_MAJORVER := 3 gb_Library_SYSPRE := lib |