ios/CustomTarget_iOS_setup.mk | 1 + solenv/gbuild/gbuild.mk | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-)
New commits: commit 1d6d1eef3a6c3c14ea88eeeadb0119624bfa8056 Author: Tor Lillqvist <[email protected]> AuthorDate: Wed Sep 5 11:19:22 2018 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Wed Sep 5 11:21:26 2018 +0300 Workaround for file name case inconsistency Change-Id: Ia13dc01f86e51064658d5ad9a996c6bd555cbeef diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 522183ed9ffc..f072736f9c17 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 commit e3bac83bec762db924149f710f1ba437e0c94582 Author: Tor Lillqvist <[email protected]> AuthorDate: Tue Sep 4 16:54:27 2018 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Wed Sep 5 11:21:26 2018 +0300 Run bin/ios-all-static-libs and put its output in a file (To be used from Xcode projects elsewhere building iOS apps that want to link to iOS code built here.) Change-Id: I39bf2a4ed059930fcfc30c4d2016dfbc698da353 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 718bb8b90d46..432640aa45f6 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -104,6 +104,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ && echo "buildid=$(BUILDID)" \ ) > $(IOSRES)/program/versionrc + $(SRCDIR)/bin/lo-all-static-libs >$(WORKDIR)/ios-all-static-libs.list #- clean ios ----------------------------------------------------------------- $(call gb_CustomTarget_get_clean_target,ios/iOS_setup): _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
