@@ -423,6 +423,11 @@ check_unusable_toolchain = \
if test "$${libc_a_path}" = "libc.a" ; then \
echo "Unable to detect the toolchain sysroot, Buildroot cannot handle this toolchain." ; \
exit 1 ; \
+ fi ; \
+ sysroot_dir="$(call toolchain_find_sysroot,$${__CROSS_CC})" ; \
+ if test -z "$${sysroot_dir}" ; then \
+ echo "External toolchain doesn't support --sysroot. Cannot use." ; \
+ exit 1 ; \
fi
#
@@ -467,17 +467,13 @@ $$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64
endef
# Checks for an already installed toolchain: check the toolchain
-# location, check that it supports sysroot, and then verify that it
+# location, check that it is usable, and then verify that it
# matches the configuration provided in Buildroot: ABI, C++ support,
# kernel headers version, type of C library and all C library features.
define TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS
$(Q)$(call check_cross_compiler_exists,$(TOOLCHAIN_EXTERNAL_CC))
$(Q)$(call check_unusable_toolchain,$(TOOLCHAIN_EXTERNAL_CC))
$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
- if test -z "$${SYSROOT_DIR}" ; then \
- @echo "External toolchain doesn't support --sysroot. Cannot use." ; \
- exit 1 ; \
- fi ; \
$(call check_kernel_headers_version,\
$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC)),\
$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST))); \
@@ -588,10 +584,6 @@ endef
define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
- if test -z "$${SYSROOT_DIR}" ; then \
- @echo "External toolchain doesn't support --sysroot. Cannot use." ; \
- exit 1 ; \
- fi ; \
ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
SUPPORT_LIB_DIR="" ; \
@@ -633,10 +625,6 @@ endef
define TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS
$(Q)SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC))" ; \
- if test -z "$${SYSROOT_DIR}" ; then \
- @echo "External toolchain doesn't support --sysroot. Cannot use." ; \
- exit 1 ; \
- fi ; \
ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
SUPPORT_LIB_DIR="" ; \
The sysroot toolchain support check is duplicated at three locations in the external toolchain infra. So move it inside the check_unusable_toolchain helper that is called when the toolchain package is configured (TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS). All checks in TOOLCHAIN_EXTERNAL_INSTALL_SYSROOT_LIBS and TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS can be safely removed since it's already done in TOOLCHAIN_EXTERNAL_CONFIGURE_CMDS. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> --- v3: add missing exit 1 s/$(__CROSS_CC)/$${__CROSS_CC}/ Improve commit log (ThomasP) v2: new patch --- toolchain/helpers.mk | 5 +++++ toolchain/toolchain-external/toolchain-external.mk | 14 +------------- 2 files changed, 6 insertions(+), 13 deletions(-)