Commit 3367d5ce authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

external-toolchain: run checks even on extracted toolchains 



When the mechanism that allows Buildroot to download external
toolchains automatically was added, all the sanity checks on the
external toolchains were not performed. This commit re-enables those
checks that we already do on external toolchains that are not
downloaded/extracted by Buildroot. This makes the toolchain checks
more consistent accross various configurations.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent c5c1064e

toolchain/toolchain-external/ext-tool.mk

+2 −4
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ endif 


ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)

TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(TOOLCHAIN_EXTERNAL_DIR)/.extracted

else

TOOLCHAIN_EXTERNAL_DEPENDENCIES = $(STAMP_DIR)/ext-toolchain-checked

endif



ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q3),y)
@@ -284,7 +282,7 @@ endif 
# location, check that it supports sysroot, and then verify that it

# matches the configuration provided in Buildroot: ABI, C++ support,

# type of C library and all C library features.

$(STAMP_DIR)/ext-toolchain-checked:

$(STAMP_DIR)/ext-toolchain-checked: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)

	@echo "Checking external toolchain settings"

	$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))

	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \
@@ -343,7 +341,7 @@ $(STAMP_DIR)/ext-toolchain-checked: 
#                       multilib variant compared to the main sysroot.

#			Ex: mips16/soft-float/el



$(STAMP_DIR)/ext-toolchain-installed: $(TOOLCHAIN_EXTERNAL_DEPENDENCIES)

$(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked

	$(Q)LIBC_A_LOCATION=`readlink -f $$(LANG=C $(TOOLCHAIN_EXTERNAL_CC) -print-file-name=libc.a)` ; \

	SYSROOT_DIR=`echo $${LIBC_A_LOCATION} | sed -r -e 's:usr/lib(64)?/libc\.a::'` ; \

	if test -z "$${SYSROOT_DIR}" ; then \