From a626bdd56d7116efa57e65403ad51b56657148c3 Mon Sep 17 00:00:00 2001
From: Michael Stahl <Michael.Stahl@cib.de>
Date: Wed, 31 Oct 2018 19:06:30 +0100
Subject: gbuild: rename value OS=IOS to OS=iOS
This gets rid of the horrible hack in gbuild.mk to accomodate the
case-incorrect iOS platform makefiles that cannot be renamed without
upsetting git on file systems that sadly lack the case sensitivity
feature.
Keep the macro defined to IOS though.
Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234
Reviewed-on: https://gerrit.libreoffice.org/62705
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
---
desktop/Library_sofficeapp.mk | 6 +++---
desktop/Module_desktop.mk | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'desktop')
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index 43833d6d3dcb..5c7de54c4ed0 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_use_externals,sofficeapp, \
icu_headers \
icui18n \
icuuc \
- $(if $(filter-out IOS,$(OS)), \
+ $(if $(filter-out iOS,$(OS)), \
curl \
)\
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
@@ -101,7 +101,7 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sofficeapp,\
endif
-ifeq ($(OS),IOS)
+ifeq ($(OS),iOS)
$(eval $(call gb_Library_add_cflags,sofficeapp,\
$(gb_OBJCFLAGS) \
@@ -154,7 +154,7 @@ endif
endif
# LibreOfficeKit bits
-ifneq ($(filter $(OS),ANDROID IOS MACOSX WNT),)
+ifneq ($(filter $(OS),ANDROID iOS MACOSX WNT),)
$(eval $(call gb_Library_add_exception_objects,sofficeapp,\
desktop/source/lib/init \
desktop/source/lib/lokinteractionhandler \
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index dfb9542a6401..9cce8f03c71f 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -100,7 +100,7 @@ else ifeq ($(OS),MACOSX)
else ifeq ($(OS),ANDROID)
-else ifeq ($(OS),IOS)
+else ifeq ($(OS),iOS)
else ifeq ($(OS),HAIKU)
--
cgit