Commit db443f26 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Thomas Petazzoni
Browse files

host-ccache: turn into a proper dependency 



This patch moves the host-ccache build target from BASE_TARGETS in Makefile
to an actual host prerequisite in support/dependencies. This causes
host-ccache to be built as part of the dependencies, before any real package
is built.
Since the dependencies are built without ccache anyway, there is no need to
set HOST_CCACHE_CONF_ENV anymore.

Suggested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 2ba10140

Makefile

+0 −4
Original line number Diff line number Diff line
@@ -222,10 +222,6 @@ GNU_HOST_NAME:=$(shell support/gnuconfig/config.guess) 
#

################################################################################



ifeq ($(BR2_CCACHE),y)

BASE_TARGETS += host-ccache

endif



ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

BASE_TARGETS += toolchain-buildroot

else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)

package/ccache/ccache.mk

+0 −6
Original line number Diff line number Diff line
@@ -10,12 +10,6 @@ CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.bz2 
CCACHE_LICENSE = GPLv3+, others

CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt



# When ccache is being built for the host, ccache is not yet

# available, so we have to use the special C compiler without the

# cache.

HOST_CCACHE_CONF_ENV = \

	CC="$(HOSTCC_NOCCACHE)"



# Force ccache to use its internal zlib. The problem is that without

# this, ccache would link against the zlib of the build system, but we

# might build and install a different version of zlib in $(O)/host

support/dependencies/dependencies.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ ifeq ($(BR2_STRIP_sstrip),y) 
DEPENDENCIES_HOST_PREREQ+=host-sstrip

endif



ifeq ($(BR2_CCACHE),y)

DEPENDENCIES_HOST_PREREQ += host-ccache

endif



core-dependencies:

	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \

		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \