|
@@ -205,14 +205,7 @@ ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
|
|
|
EXTERNAL_LIBS+=libstdc++.so
|
|
|
endif
|
|
|
|
|
|
-# This dance is needed because the toolchain may have been relocated, so the
|
|
|
-# configured paths may no longer match; fortunately, the sysroot moves along
|
|
|
-# the toolchain, so is always at the same place relative to the toolchain's
|
|
|
-# current location.
|
|
|
-CFG_PREFIX_DIR=$(shell LANG=C $(TARGET_CC) -v 2>&1 | grep ^Configured | tr " " "\n" | grep -- "--prefix=" | cut -f2 -d=)
|
|
|
-CFG_SYSROOT_DIR=$(shell LANG=C $(TARGET_CC) -v 2>&1 | grep ^Configured | tr " " "\n" | grep -- "--with-sysroot=" | cut -f2 -d=)
|
|
|
-REL_SYSROOT_DIR=$(shell echo "$(CFG_SYSROOT_DIR)" |sed -r -e 's:^$(CFG_PREFIX_DIR)::;')
|
|
|
-SYSROOT_DIR=$(TOOLCHAIN_EXTERNAL_PATH)/$(REL_SYSROOT_DIR)
|
|
|
+SYSROOT_DIR=$(shell readlink -f $$(LANG=C $(TARGET_CC) -print-file-name=libc.a |sed -r -e 's:usr/lib/libc\.a::;'))
|
|
|
|
|
|
$(STAMP_DIR)/ext-toolchain-installed:
|
|
|
@echo "Checking external toolchain settings"
|