From 2fbf4831617f13daedf0a80cfe6042f5ac088da1 Mon Sep 17 00:00:00 2001 From: Christian Lohmaier Date: Wed, 29 Jun 2022 12:28:45 +0200 Subject: Don't link against private CoreUI framework when sandboxed Actual use of the code was already disabled since 2014 with b8bee05dbf85bc4f5834520aa5d64e9ae18aba4e - but the link flags were not conditionalized. Change-Id: Ia1dd299cb78274850eb6a7b10259991bb4970ab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136614 Tested-by: Jenkins Reviewed-by: Christian Lohmaier (cherry picked from commit 7a493a7d64dc634ae2d5d6931b8ce33223cb3985) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136553 Reviewed-by: Adolfo Jayme Barrientos --- vcl/Library_vclplug_osx.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'vcl') diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk index e2a1a5161bdd..e0adee810a30 100644 --- a/vcl/Library_vclplug_osx.mk +++ b/vcl/Library_vclplug_osx.mk @@ -30,10 +30,14 @@ $(eval $(call gb_Library_use_custom_headers,vclplug_osx,\ officecfg/registry \ )) +# TODO: arguably the private CoreUI framework should never be used, no matter whether building +# a sandboxed version or a "regular" desktop version $(eval $(call gb_Library_add_libs,vclplug_osx,\ -framework IOKit \ - -F/System/Library/PrivateFrameworks \ - -framework CoreUI \ + $(if $(ENABLE_MACOSX_SANDBOX),,\ + -F/System/Library/PrivateFrameworks \ + -framework CoreUI \ + ) \ -lobjc \ )) -- cgit