config_host.mk.in | 1 -
configure.ac | 12 ------------
desktop/Executable_soffice_bin.mk | 2 +-
3 files changed, 1 insertion(+), 14 deletions(-)
New commits:
commit c96855088af32849e0155e201dceb0e7c13ab05b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Feb 20 18:18:40 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Feb 20 23:15:52 2020 +0100
macOS Xcode ld is known to always support -platform_version now
...after 358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build
baseline to
Xcode 11.3 and macOS 10.14.4".
This effectively reverts b7fd89100d8653dc73955780358fe31d38b68ebf
"tdf#122218:
Baseline Xcode 9.3 ld presumably doesn't support -platform_version".
Change-Id: Ib79563babe3cc948556d5369b0f6b6a8d208cab2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89160
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index 9e8b0c2304e9..215212a6f06a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -268,7 +268,6 @@ 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@
diff --git a/configure.ac b/configure.ac
index 77e4619f5022..afc41c0c555a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2793,7 +2793,6 @@ dnl
===================================================================
dnl Check macOS SDK and compiler
dnl ===================================================================
-HAVE_MACOS_LD_PLATFORMVERSION=
if test $_os = Darwin; then
# If no --with-macosx-sdk option is given, look for one
@@ -3028,16 +3027,6 @@ if test $_os = Darwin; then
AC_MSG_CHECKING([what macOS app bundle identifier to use])
MACOSX_BUNDLE_IDENTIFIER=$with_macosx_bundle_identifier
AC_MSG_RESULT([$MACOSX_BUNDLE_IDENTIFIER])
-
- AC_MSG_CHECKING([whether the linker supports -platform_version])
- save_LDFLAGS=$LDFLAGS
- LDFLAGS="$LDFLAGS -Xlinker -platform_version -Xlinker macos -Xlinker
$MACOSX_DEPLOYMENT_TARGET \
- -Xlinker 0.0.0"
- AC_LINK_IFELSE([AC_LANG_PROGRAM()],
- [AC_MSG_RESULT([yes])
- HAVE_MACOS_LD_PLATFORMVERSION=TRUE],
- [AC_MSG_RESULT([no])])
- LDFLAGS=$save_LDFLAGS
fi
AC_SUBST(MACOSX_SDK_PATH)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
@@ -3049,7 +3038,6 @@ AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
AC_SUBST(MACOSX_PACKAGE_SIGNING_IDENTITY)
AC_SUBST(ENABLE_MACOSX_SANDBOX)
AC_SUBST(MACOSX_BUNDLE_IDENTIFIER)
-AC_SUBST(HAVE_MACOS_LD_PLATFORMVERSION)
dnl ===================================================================
dnl Check iOS SDK and compiler
diff --git a/desktop/Executable_soffice_bin.mk
b/desktop/Executable_soffice_bin.mk
index e4f987fd8f13..5c895ed0e7cb 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/desktop/Executable_soffice_bin.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_Executable_add_cobjects,soffice_bin,\
desktop/source/app/main \
))
-ifeq ($(OS)-$(HAVE_MACOS_LD_PLATFORMVERSION),MACOSX-TRUE)
+ifeq ($(OS),MACOSX)
# 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
