|
@@ -617,12 +617,7 @@ endef
|
|
# to the target filesystem.
|
|
# to the target filesystem.
|
|
|
|
|
|
define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
|
|
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))" ; \
|
|
ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
|
|
SUPPORT_LIB_DIR="" ; \
|
|
SUPPORT_LIB_DIR="" ; \
|
|
if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
|
|
if test `find $${ARCH_SYSROOT_DIR} -name 'libstdc++.a' | wc -l` -eq 0 ; then \
|
|
@@ -631,7 +626,6 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
|
|
SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
|
|
SUPPORT_LIB_DIR=`readlink -f $${LIBSTDCPP_A_LOCATION} | sed -r -e 's:libstdc\+\+\.a::'` ; \
|
|
fi ; \
|
|
fi ; \
|
|
fi ; \
|
|
fi ; \
|
|
- ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \
|
|
|
|
if test -z "$(BR2_STATIC_LIBS)" ; then \
|
|
if test -z "$(BR2_STATIC_LIBS)" ; then \
|
|
$(call MESSAGE,"Copying external toolchain libraries to target...") ; \
|
|
$(call MESSAGE,"Copying external toolchain libraries to target...") ; \
|
|
for libs in $(LIB_EXTERNAL_LIBS); do \
|
|
for libs in $(LIB_EXTERNAL_LIBS); do \
|