summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2018-09-05 11:19:22 +0300
committerMichael Meeks <michael.meeks@collabora.com>2018-10-30 17:00:41 +0000
commit669ac96a35675a8ce3ac4cf0eadb42147ae03418 (patch)
treed93782ba2f5436a171ef4e796ba68f48665ac2fe /solenv
parent0862e6502d95d0d45432978f1363b88bceb595a3 (diff)
Workaround for file name case inconsistency
Change-Id: Ia13dc01f86e51064658d5ad9a996c6bd555cbeef (cherry picked from commit 1d6d1eef3a6c3c14ea88eeeadb0119624bfa8056) Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/gbuild.mk14
1 files changed, 13 insertions, 1 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index b87f6fc569dd..309906b38d0c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -166,7 +166,19 @@ $(eval $(call gb_Helper_collect_knownlibs))
gb_Library_DLLPOSTFIX := lo
# Include platform/cpu/compiler specific config/definitions
-include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
+
+# Work around inconsistency in case of $(OS) being "IOS" (all
+# upper-case) vs. the file being included here having the name
+# iOS_*_*.mk (lower-case 'i'). This went unnoticed until now when I
+# happen to build for iOS on a case-sensitive file system.
+
+ifeq ($(OS),IOS)
+gbuildplatformosname=iOS
+else
+gbuildplatformosname=$(OS)
+endif
+
+include $(GBUILDDIR)/platform/$(gbuildplatformosname)_$(CPUNAME)_$(COM).mk
# this is optional
include $(SRCDIR)/RepositoryFixes.mk