diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-14 15:23:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-14 17:29:45 +0100 |
| commit | b7fd89100d8653dc73955780358fe31d38b68ebf (patch) | |
| tree | 61130b26cab8aa97eceafd283e0f850cdeeb6010 /config_host.mk.in | |
| parent | 391613785ae6fbb735cf7a86ea2f6a93161a8769 (diff) | |
tdf#122218: Baseline Xcode 9.3 ld presumably doesn't support -platform_version
...according to <https://github.com/llvm/llvm-project/commit/
25ce33a6e4f3b13732c0f851e68390dc2acb9123> "[driver][darwin] Pass
-platform_version flag to the linker instead of the -<platform>_version_min
flag": "In Xcode 11, ld added a new flag called -platform_version [...] This
patch adopts the new -platform_version flag in Clang, and starts using it by
default, unless a linker version < 520 is passed to the driver."
So detect new HAVE_MACOS_LD_PLATFORMVERSION and adapt
645fe53be0dc36535dba0ed684e21ca4cda80d70 "tdf#122218: Hack to avoid blurry text
with macOS SDK 10.15" accordingly.
(This also changes the passed -platform_verion sdk value from 0.0 to 0.0.0, for
cosmetic consistency with the default Clang behavior cited above. Also, after
f67e5ef9a5c71f3b35b1c67eb72794e44cc15410 "Drop broken filter-out of
-bind_at_load for Executable_soffice_bin on macOS" got included in the meantime,
the surrounding ifeq in desktop/Executable_soffice_bin.mk can be combined now.)
Change-Id: Ie1ddf2d618e2f1232c6b4e17ce17665851f3bd38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88717
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 88a529da664a..9dd4b72c421c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -266,6 +266,7 @@ export HAVE_GCC_STACK_CLASH_PROTECTION=@HAVE_GCC_STACK_CLASH_PROTECTION@ export HAVE_GNUMAKE_FILE_FUNC=@HAVE_GNUMAKE_FILE_FUNC@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@ export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@ +export HAVE_MACOS_LD_PLATFORMVERSION=@HAVE_MACOS_LD_PLATFORMVERSION@ export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@ export HAVE_WDEPRECATED_COPY_DTOR=@HAVE_WDEPRECATED_COPY_DTOR@ export HELP_ONLINE=@HELP_ONLINE@ |