aboutsummaryrefslogtreecommitdiff
path: root/Config.in
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2016-09-02 16:20:33 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2016-09-02 16:20:33 +0200
commit7353967690b425fd6519756979f3ef839b1a9cd1 (patch)
treea910fd6b794556251fe607295c631aed98534235 /Config.in
parentcff53ce35b8dab3bbdd9aa4471d1ecb3238c9fab (diff)
parent1bd02bc230e1b3b22ca3eb23fb3dcb91b878283a (diff)
downloadbuildroot-7353967690b425fd6519756979f3ef839b1a9cd1.tar.gz
buildroot-7353967690b425fd6519756979f3ef839b1a9cd1.tar.bz2
Merge branch 'next'
Quite some conflicts, so here goes .. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'Config.in')
-rw-r--r--Config.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/Config.in b/Config.in
index ed92c5617f..3f53f255de 100644
--- a/Config.in
+++ b/Config.in
@@ -18,6 +18,10 @@ config BR2_EXTERNAL
string
option env="BR2_EXTERNAL"
+config BR2_BUILD_DIR
+ string
+ option env="BUILD_DIR"
+
# Hidden config symbols for packages to check system gcc version
config BR2_HOST_GCC_VERSION
string
@@ -763,3 +767,5 @@ menu "User-provided options"
source "$BR2_EXTERNAL/Config.in"
endmenu
+
+source "$BR2_BUILD_DIR/.br2-external.in"