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 /bridges | |
| 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 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 902b735b3d65..421483f08f42 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -164,7 +164,7 @@ bridges_SELECTED_BRIDGE := gcc3_linux_x86-64 bridge_asm_objects := call bridge_noncallexception_noopt_objects := callvirtualmethod bridge_exception_objects := abi cpp2uno except rtti uno2cpp -else ifneq ($(filter MACOSX IOS,$(OS)),) +else ifneq ($(filter MACOSX iOS,$(OS)),) bridges_SELECTED_BRIDGE := gcc3_macosx_x86-64 bridge_exception_objects := abi call cpp2uno except uno2cpp bridge_noncallexception_noopt_objects := callvirtualmethod @@ -206,7 +206,7 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\ $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \ )) -ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX IOS HAIKU,$(OS)),) +ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX iOS HAIKU,$(OS)),) $(eval $(call gb_Library_add_libs,gcc3_uno,\ -ldl \ )) |