diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-10-31 19:06:30 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-11-01 16:39:54 +0100 |
| commit | a626bdd56d7116efa57e65403ad51b56657148c3 (patch) | |
| tree | f48fac9d3e2fe327b59f10c1229eb43a2c3858da /Makefile.in | |
| parent | 4bd701a306c8068911203f976145adc717f015d2 (diff) | |
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>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index a18121d200ca..393e94fda331 100644 --- a/Makefile.in +++ b/Makefile.in @@ -178,7 +178,7 @@ clean-host: rm -fr $(TESTINSTALLDIR) rm -fr $(INSTDIR) rm -fr $(WORKDIR) -ifeq ($(OS),IOS) +ifeq ($(OS),iOS) rm -fr $(SRCDIR)/ios/generated endif @@ -284,7 +284,7 @@ build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \ $(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \ install-gdb-printers $(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal) -ifeq ($(OS),IOS) +ifeq ($(OS),iOS) $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios endif @@ -295,13 +295,13 @@ help showmodules gbuildtojson: cross-toolset: bootstrap fetch # fetch again in case there are externals only needed on build platform -ifneq ($(OS),IOS) +ifneq ($(OS),iOS) $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(BUILDDIR)/Makefile fetch endif $(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build-tools install-gdb-printers: -ifneq ($(filter-out WNT MACOSX IOS,$(OS)),) +ifneq ($(filter-out WNT MACOSX iOS,$(OS)),) mkdir -p $(INSTDIR) $(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c endif |