[Buildroot] [PATCH 2/5] toolchain-external: remove unused calculation of ARCH_SUBDIR
Romain Naour
romain.naour at gmail.com
Tue Mar 22 21:53:58 UTC 2016
Hi Thomas, all,
Le 12/02/2016 20:20, Thomas De Schampheleire a écrit :
> From: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
>
> In TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS, ARCH_SUBDIR is calculated but not
> used, and can thus be removed. Since SYSROOT_DIR is only used for the
> calculation of ARCH_SUBDIR, it can be removed too.
>
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire at gmail.com>
Reviewed-by: Romain Naour <romain.naour at gmail.com>
Best regards,
Romain
> ---
> toolchain/toolchain-external/toolchain-external.mk | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
> index ffdee49..9d88158 100644
> --- a/toolchain/toolchain-external/toolchain-external.mk
> +++ b/toolchain/toolchain-external/toolchain-external.mk
> @@ -587,12 +587,7 @@ endef
> # to the target filesystem.
>
> 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))" ; \
> + $(Q)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="" ; \
> if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
> @@ -601,7 +596,6 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
> SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
> fi ; \
> fi ; \
> - ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
> if test -z "$(BR2_STATIC_LIBS)" ; then \
> $(call MESSAGE,"Copying external toolchain libraries to target...") ; \
> for libs in $(LIB_EXTERNAL_LIBS); do \
>
More information about the buildroot
mailing list