From 94be1f470c148afe1b7b2a7e43b886c4ddea2e15 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Tue, 25 Jan 2011 20:31:16 +0100 Subject: config: add an option to name the sysroot directory Depending on local policies, some users have expressed a need to have the sysroot be named differently than the hard-coded name. Add an option for that. Default to 'sysroot' to match the existing literature. While at it, replace 'sys-root' with 'sysroot' everywhere we reference the sysroot. Reported-by: Alexey Kuznetsov Signed-off-by: "Yann E. MORIN" --- config/toolchain.in | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'config/toolchain.in') diff --git a/config/toolchain.in b/config/toolchain.in index 47f50f39..07110e49 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -8,10 +8,23 @@ config USE_SYSROOT default y help Use the 'shinny new' sysroot feature of gcc: libraries split between - prefix/target/sys-root/lib and prefix/target/sys-root/usr/lib + prefix/target/sysroot/lib and prefix/target/sysroot/usr/lib You definitely want to say 'Y' here. Yes you do. I know you do. Say 'Y'. +config SYSROOT_NAME + string + prompt "sysroot directory name" + depends on USE_SYSROOT + default "sysroot" + help + Enter the base name of the sysroot directory. Usually, this simply + is 'sysroot' (the default) or 'sys-root'. + + You are free to enter anything here, except for spaces, and '/' + (see SYSROOT_DIR_PREFIX, below). If you leave this empy, then the + default 'sysroot' is used. + config SYSROOT_DIR_PREFIX string prompt "sysroot prefix dir (READ HELP)" if ! BACKEND @@ -26,7 +39,7 @@ config SYSROOT_DIR_PREFIX to the sysroot path, just before the actual sysroot directory. In fact, the sysroot path is constructed as: - ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root + ${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/${CT_SYSROOT_NAME} config STATIC_TOOLCHAIN bool -- cgit v1.2.3