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 /external/libnumbertext | |
| 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 'external/libnumbertext')
| -rw-r--r-- | external/libnumbertext/ExternalProject_libnumbertext.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk index c36336ae52bf..2b899c63d132 100644 --- a/external/libnumbertext/ExternalProject_libnumbertext.mk +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -18,7 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,libnumbertext,\ libnumbertext_CXXFLAGS=$(CXXFLAGS) $(CXXFLAGS_CXX11) -ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS))) +ifneq (,$(filter ANDROID DRAGONFLY FREEBSD iOS LINUX NETBSD OPENBSD,$(OS))) ifneq (,$(gb_ENABLE_DBGUTIL)) libnumbertext_CPPFLAGS+=-D_GLIBCXX_DEBUG endif @@ -29,7 +29,7 @@ libnumbertext_LIBS+=-L$(gb_StaticLibrary_WORKDIR) $(call gb_ExternalProject_get_state_target,libnumbertext,build): $(call gb_ExternalProject_run,build,\ $(if $(libnumbertext_LIBS),LIBS='$(libnumbertext_LIBS)') \ - $(if $(filter IOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \ + $(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \ autoreconf && \ LIBS="$(gb_STDLIBS) $(LIBS)" \ $(SHELL) ./configure --disable-shared --with-pic \ |