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/nss | |
| parent | tdf#92848: SvxTableShape doesn't implement css::text::XTextAppend (diff) | |
| download | core-a626bdd56d7116efa57e65403ad51b56657148c3.tar.gz core-a626bdd56d7116efa57e65403ad51b56657148c3.zip | |
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/nss')
| -rw-r--r-- | external/nss/ExternalPackage_nss.mk | 2 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 4 | ||||
| -rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/external/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk index 6d568b7edfee..2b15fc3eb2a8 100644 --- a/external/nss/ExternalPackage_nss.mk +++ b/external/nss/ExternalPackage_nss.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss)) $(eval $(call gb_ExternalPackage_use_external_project,nss,nss)) -ifeq ($(OS),IOS) +ifeq ($(OS),iOS) # nothing... else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index e83054ca79b7..a270e1f7de87 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -33,7 +33,7 @@ else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ - $(if $(filter IOS,$(OS)),\ + $(if $(filter iOS,$(OS)),\ $(if $(filter arm64,$(CC)),USE_64=1)) \ $(if $(filter MACOSX,$(OS)),\ $(if $(filter-out POWERPC,$(CPUNAME)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH)) \ @@ -42,7 +42,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(CROSS_COMPILING),\ $(if $(filter MACOSXPOWERPC,$(OS)$(CPUNAME)),CPU_ARCH=ppc) \ - $(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ + $(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ $(MAKE) -j1 AR="$(AR)" \ diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 98cfe73ab4aa..e20598f4ae01 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.vs2015.patch) \ external/nss/ubsan.patch.0 \ external/nss/clang-cl.patch.0 \ - $(if $(filter IOS,$(OS)), \ + $(if $(filter iOS,$(OS)), \ external/nss/nss-chromium-nss-static.patch \ external/nss/nss-more-static.patch \ external/nss/nss-ios.patch) \ |