aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsupport/scripts/br2-external9
-rw-r--r--toolchain/toolchain-external/Config.in5
2 files changed, 13 insertions, 1 deletions
diff --git a/support/scripts/br2-external b/support/scripts/br2-external
index da315d5c1d..b08b77bd33 100755
--- a/support/scripts/br2-external
+++ b/support/scripts/br2-external
@@ -157,6 +157,7 @@ do_kconfig() {
items=(
paths
menus
+ toolchains
)
for br2 in "${items[@]}"; do
@@ -196,6 +197,14 @@ do_kconfig() {
fi
printf '\n'
} >>"${outputdir}/.br2-external.in.menus"
+
+ if [ -f "${br2_ext}/provides/toolchains.in" ]; then
+ printf 'comment "Toolchains from: %s"\n' "${br2_desc}"
+ printf 'source "%s/provides/toolchains.in"\n' "${br2_ext}"
+ printf '\n'
+ else
+ printf '# No toolchain from: %s\n\n' "${br2_desc}"
+ fi >>"${outputdir}/.br2-external.in.toolchains"
done
printf 'endmenu\n' >>"${outputdir}/.br2-external.in.menus"
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index d234c1c552..128bea257e 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -47,9 +47,12 @@ source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Confi
# Kept last, so it remains the non-default choice, unless there isn't
# any available toolchain profile for the currently selected
-# architecture.
+# architecture, but before toolchains from br2-external trees.
source "toolchain/toolchain-external/toolchain-external-custom/Config.in"
+# Toolchains from br2-external trees, if any
+source "$BR2_BASE_DIR/.br2-external.in.toolchains"
+
endchoice
choice