diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-06-29 12:28:45 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-07-02 17:08:28 +0200 |
| commit | 489dff5832c6e96175ff37380e1743014cf7ffda (patch) | |
| tree | d7196d07f9ac6aba1cda5187ae89d1392956bd20 /vcl | |
| parent | 6de586f3d67539535d549fc8d77b5a6a7a25a85c (diff) | |
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 <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 7a493a7d64dc634ae2d5d6931b8ce33223cb3985)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136553
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_osx.mk | 8 |
1 files changed, 6 insertions, 2 deletions
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 \ )) |