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 /sal/Library_sal.mk | |
| 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 'sal/Library_sal.mk')
| -rw-r--r-- | sal/Library_sal.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 868d9f8dd23d..47f02c85eae6 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -23,7 +23,7 @@ $(eval $(call gb_Library_add_defs,sal,\ $(if $(filter FUZZERS,$(BUILD_TYPE)), \ -DFORCE_DEFAULT_SIGNAL \ ) \ - $(if $(filter IOS,$(OS)), \ + $(if $(filter iOS,$(OS)), \ -DNO_CHILD_PROCESSES \ ) \ -DSAL_DLLIMPLEMENTATION \ @@ -120,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/textenc/unichars \ )) -ifeq ($(OS),IOS) +ifeq ($(OS),iOS) $(eval $(call gb_Library_add_cxxflags,sal,\ $(gb_OBJCXXFLAGS) \ )) @@ -179,7 +179,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/tempfile \ sal/osl/unx/thread \ sal/osl/unx/time \ - $(if $(filter-out ANDROID IOS,$(OS)), sal/osl/unx/salinit) \ + $(if $(filter-out ANDROID iOS,$(OS)), sal/osl/unx/salinit) \ )) # Note that the uunxapi.mm file just includes the uunxapi.cxx one. Ditto for system.mm @@ -195,7 +195,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\ )) endif -ifneq ($(filter MACOSX IOS,$(OS)),) +ifneq ($(filter MACOSX iOS,$(OS)),) $(eval $(call gb_Library_add_exception_objects,sal,\ sal/osl/unx/osxlocale \ )) |