diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-05-23 19:03:15 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-05-23 19:05:26 +0200 |
| commit | 7a447a8c60113f53b237b633b940a761188a3885 (patch) | |
| tree | 9917fb71d46ab45aab486add9851d289fd30b33c /desktop | |
| parent | 69f9c57551120afbb7e2d877f8478148a0c545dc (diff) | |
iOS, remove curl to make iOS compile
Commit 9c3b05f2d571b58ee2322a942162ecec654544dc
added curl, without affect on iOS
some of the conditions changed later
making curl be included when compiling iOS
Added filter_out macro for iOS
Change-Id: I22a9ffd47f56893ea366fffa3ef0a0610ea54370
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 6998060d92dc..7b76aedc4d33 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -31,7 +31,9 @@ $(eval $(call gb_Library_use_externals,sofficeapp, \ icu_headers \ icui18n \ icuuc \ + $(if $(filter-out IOS,$(OS)), \ curl \ + )\ $(if $(ENABLE_ONLINE_UPDATE_MAR),\ orcus-parser \ orcus )\ |