A: ninja can make use of ccache out of the box B: ninja participates in the toplevel make job server The target architecture now comes from the compiler configure selected instead of the generator's -A. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I86951768ae42a6684b80298ff149af6c8d8d7fb7 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/10654 Reviewed-by: Noel Grandin <noel.grandin@collabora.com> Tested-by: Jenkins CPCI <releng@collaboraoffice.com> (cherry picked from commit 29fc77fea92e28dc007781d7f728b67f5b55c58b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210984 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
29 lines
1.2 KiB
Makefile
29 lines
1.2 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_ExternalPackage_ExternalPackage,libxml2,libxml2))
|
|
|
|
$(eval $(call gb_ExternalPackage_use_external_project,libxml2,libxml2))
|
|
|
|
ifneq ($(DISABLE_DYNLOADING),TRUE)
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.16.dylib,.libs/libxml2.16.dylib))
|
|
else ifeq ($(OS),WNT)
|
|
ifeq ($(COM),GCC)
|
|
$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,libxml2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
|
|
else # COM=MSC
|
|
$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,libxml2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
|
|
endif
|
|
else # OS!=WNT
|
|
$(eval $(call gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.16,.libs/libxml2.so.16.1.$(LIBXML_VERSION_MICRO)))
|
|
endif
|
|
endif # DISABLE_DYNLOADING
|
|
|
|
# vim: set noet sw=4 ts=4:
|