Skip to content

Commit

Permalink
Revert "toolchain: Add option to only use ccache for BR"
Browse files Browse the repository at this point in the history
This reverts commit 4ebc520.

It has been implemented differently in upstream Buildroot.

Signed-off-by: Paul Cercueil <[email protected]>
  • Loading branch information
pcercuei committed Jun 5, 2023
1 parent bbe62f2 commit 77c9810
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 25 deletions.
8 changes: 0 additions & 8 deletions Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -377,14 +377,6 @@ config BR2_CCACHE_USE_BASEDIR
the section "COMPILING IN DIFFERENT DIRECTORIES" in the ccache
manual for more information.

config BR2_CCACHE_BR_ONLY
bool "Only use ccache for building Buildroot packages"
default n
help
When enabled, ccache will be used when building Buildroot
itself, but the toolchain exported as SDK will not make use of
ccache to build external programs.

endif

config BR2_ENABLE_DEBUG
Expand Down
4 changes: 0 additions & 4 deletions linux/linux.mk
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ LINUX_MAKE_ENV = \
$(HOST_MAKE_ENV) \
BR_BINARIES_DIR=$(BINARIES_DIR)

ifeq ($(BR2_CCACHE_BR_ONLY),y)
LINUX_MAKE_ENV += BR_USE_CCACHE=1
endif

LINUX_INSTALL_IMAGES = YES
LINUX_DEPENDENCIES = host-kmod

Expand Down
4 changes: 0 additions & 4 deletions package/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ export PERL5LIB=$(HOST_DIR)/lib/perl

TARGET_MAKE_ENV = PATH=$(BR_PATH)

ifeq ($(BR2_CCACHE_BR_ONLY),y)
TARGET_MAKE_ENV += BR_USE_CCACHE=1
endif

TARGET_CONFIGURE_OPTS = \
$(TARGET_MAKE_ENV) \
AR="$(TARGET_AR)" \
Expand Down
5 changes: 0 additions & 5 deletions toolchain/toolchain-wrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,11 +517,6 @@ int main(int argc, char **argv)
} else
/* ccache is disabled, skip it */
exec_args++;
#ifdef BR_CCACHE_BR_ONLY
else if (!getenv("BR_USE_CCACHE"))
/* Skip the ccache call */
exec_args++;
#endif
#endif

/* Debug the wrapper to see final arguments passed to the real compiler. */
Expand Down
4 changes: 0 additions & 4 deletions toolchain/toolchain-wrapper.mk
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ ifeq ($(BR2_CCACHE_USE_BASEDIR),y)
TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"'
endif

ifeq ($(BR2_CCACHE_BR_ONLY),y)
TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BR_ONLY
endif

ifeq ($(BR2_PIC_PIE),y)
TOOLCHAIN_WRAPPER_ARGS += -DBR2_PIC_PIE
endif
Expand Down

0 comments on commit 77c9810

Please sign in to comment.