From 0b28ee9267f790792eb8335ee2ceba268ea6152e Mon Sep 17 00:00:00 2001 From: Juergen Stuber Date: Thu, 27 May 2021 16:51:18 +0200 Subject: [PATCH] toolchain/toolchain-external: Allow relative paths in BR2_TOOLCHAIN_EXTERNAL_PATH. Convert BR2_TOOLCHAIN_EXTERNAL_PATH to an absolute path when used. Otherwise the symbolic links to the external toolchain binaries are not installed in host/bin when BR2_TOOLCHAIN_EXTERNAL_PATH is relative. This happens because TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER changes directory into host/bin to create the symbolic links. From there the tools are no longer found via the relative path and a single symbolic link host/bin/$(prefix)-* is created instead. Although relative paths sounds like something less than ideal to put in a Buildroot configuration, it's actually rather typical to put the buildroot sources as a submodule (or subdirectory) of custom sources (either in a BR2_EXTERNAL or not), in which case the relative path is well-defined. Signed-off-by: Juergen Stuber Reviewed-by: Romain Naour Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-external/pkg-toolchain-external.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 68d7a3fe21..299b6008aa 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -68,7 +68,7 @@ TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR = $(HOST_DIR)/opt/ext-toolchain ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y) TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR) else -TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) +TOOLCHAIN_EXTERNAL_INSTALL_DIR = $(abspath $(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))) endif ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)