diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-14 01:37:10 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-15 17:53:18 +0100 |
| commit | 1896b9cf0011b0f2f453d8123141ab24957b8947 (patch) | |
| tree | 7fdeae6e36c15d7a5a2a52d9b71e6d2f6b9fd00f /desktop | |
| parent | tdf#126700 allow replacing the default documents (diff) | |
| download | core-1896b9cf0011b0f2f453d8123141ab24957b8947.tar.gz core-1896b9cf0011b0f2f453d8123141ab24957b8947.zip | |
tdf#122218: Hack to avoid blurry text with macOS SDK 10.15
...by setting the LC_VERSION_MIN_MACOSX load command's sdk value to n/a in the
soffice executable.
See <https://bugs.documentfoundation.org/show_bug.cgi?id=122218#c167> for how
this helps, even though I have no idea why it helps.
(Adding that -platform_version linker option appears to generate warnings like
> ld: warning: passed two min versions (10.13.0, 10.13) for platform macOS. Using 10.13.
but which are probably harmless.)
(cherry picked from commit 645fe53be0dc36535dba0ed684e21ca4cda80d70)
Plus cherry-pick of follow-up b7fd89100d8653dc73955780358fe31d38b68ebf
"tdf#122218: Baseline Xcode 9.3 ld presumably doesn't support -platform_version"
(and resolving the merge conflict in desktop/Executable_soffice_bin.mk).
cherry picked from libreoffice-6-4
<https://gerrit.libreoffice.org/c/core/+/88753>
Conflicts:
configure.ac
Change-Id: I043498c7ff2d148d4a7e1e0e9d46241b638f2eba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88667
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88755
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index d8084cddeb1f..7aaa4ffabdf2 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -31,6 +31,19 @@ $(eval $(call gb_Executable_set_ldflags,\ endif +ifeq ($(OS)-$(HAVE_MACOS_LD_PLATFORMVERSION),MACOSX-TRUE) +# At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX load command's sdk +# value from 10.15 to "n/a" (i.e., 0.0.0) is necessary to avoid blurry text in the LO UI (see +# <https://github.com/llvm/llvm-project/commit/25ce33a6e4f3b13732c0f851e68390dc2acb9123> +# "[driver][darwin] Pass -platform_version flag to the linker instead of the +# -<platform>_version_min flag", clang/test/Driver/darwin-ld-platform-version-macos.c in particular, +# for the -platform_version that Clang passes by default to new-enough ld): +$(eval $(call gb_Executable_add_ldflags,soffice_bin, \ + -Xlinker -platform_version -Xlinker macos -Xlinker $(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS) \ + -Xlinker 0.0.0 \ +)) +endif + ifeq ($(OS),WNT) $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO)) |