11 files changed, 18 insertions, 44 deletions
diff --git a/scripts/build/debug.sh b/scripts/build/debug.sh
index 54412298..f07b295c 100644
--- a/scripts/build/debug.sh
+++ b/scripts/build/debug.sh
@@ -3,11 +3,15 @@
 # List all debug facilities, and parse their scripts
 CT_DEBUG_FACILITY_LIST=
 for f in "${CT_LIB_DIR}/scripts/build/debug/"*.sh; do
-    is_enabled=
-    . "${f}"
-    f=$(basename "${f}" .sh)
-    if [ "${is_enabled}" = "y" ]; then
-        CT_DEBUG_FACILITY_LIST="${CT_DEBUG_FACILITY_LIST} ${f#???-}"
+    _f="$(basename "${f}" .sh)"
+    _f="${_f#???-}"
+    __f="CT_DEBUG_${_f}"
+    if [ "${!__f}" = "y" ]; then
+        CT_DoLog DEBUG "Enabling debug '${_f}'"
+        . "${f}"
+        CT_DEBUG_FACILITY_LIST="${CT_DEBUG_FACILITY_LIST} ${_f}"
+    else
+        CT_DoLog DEBUG "Disabling debug '${_f}'"
     fi
 done
 
diff --git a/scripts/build/debug/000-template.sh b/scripts/build/debug/000-template.sh
index 0e63d7ea..b6eaa9a1 100644
--- a/scripts/build/debug/000-template.sh
+++ b/scripts/build/debug/000-template.sh
@@ -1,19 +1,12 @@
 # Template file for a debug utility
 
-# Check here wether your debug tool is enabled or not.
-# This will get redefined over and over again for each tool, so don't
-# count on it in the functions below.
-is_enabled="${CT_FOOBAR}"
-
 # Small function to print the filename
 # Note that this function gets redefined over and over for each tool
 # It's of no use when building the toolchain proper, but shows all its
 # usefullness when saving the toolchain and building the tarball.
-# You shall not echo anything if you're not enabled!
 # Echo the name of the file, without the extension, below.
 do_print_filename() {
     # For example:
-    # [ "${CT_FOOBAR}" = "y" ] || return 0
     # echo "foobar-${CT_FOOBAR_VERSION}"
     :
 }
diff --git a/scripts/build/debug/100-dmalloc.sh b/scripts/build/debug/100-dmalloc.sh
index 59b25b31..fcb6f9df 100644
--- a/scripts/build/debug/100-dmalloc.sh
+++ b/scripts/build/debug/100-dmalloc.sh
@@ -1,9 +1,6 @@
 # Build script for the dmalloc debug library facility
 
-is_enabled="${CT_DMALLOC}"
-
 do_print_filename() {
-    [ "${CT_DMALLOC}" = "y" ] || return 0
     echo "dmalloc-${CT_DMALLOC_VERSION}"
 }
 
diff --git a/scripts/build/debug/200-duma.sh b/scripts/build/debug/200-duma.sh
index 954aa835..b14485de 100644
--- a/scripts/build/debug/200-duma.sh
+++ b/scripts/build/debug/200-duma.sh
@@ -1,9 +1,6 @@
 # Build script for D.U.M.A.
 
-is_enabled="${CT_DUMA}"
-
 do_print_filename() {
-    [ "${CT_DUMA}" = "y" ] || return 0
     echo "duma_${CT_DUMA_VERSION}"
 }
 
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index e00841bf..321e13ac 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -1,9 +1,6 @@
 # Build script for the gdb debug facility
 
-is_enabled="${CT_GDB}"
-
 do_print_filename() {
-    [ "${CT_GDB}" = "y" ] || return 0
     echo "gdb$(do_debug_gdb_suffix)"
     if [ "${CT_GDB_NATIVE}" = "y" ]; then
         echo "ncurses-${CT_NCURSES_VERSION}"
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 12f610cf..32e11ea1 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -1,9 +1,6 @@
 # Build script for ltrace
 
-is_enabled="${CT_LTRACE}"
-
 do_print_filename() {
-    [ "${CT_LTRACE}" = "y" ] || return 0
     echo "ltrace-${CT_LTRACE_VERSION}.orig"
 }
 
diff --git a/scripts/build/debug/500-strace.sh b/scripts/build/debug/500-strace.sh
index 26fcc997..ee1fc2c9 100644
--- a/scripts/build/debug/500-strace.sh
+++ b/scripts/build/debug/500-strace.sh
@@ -1,9 +1,6 @@
 # Build script for strace
 
-is_enabled="${CT_STRACE}"
-
 do_print_filename() {
-    [ "${CT_STRACE}" = "y" ] || return 0
     echo "strace-${CT_STRACE_VERSION}"
 }
 
diff --git a/scripts/build/tools.sh b/scripts/build/tools.sh
index 693893cd..bb07c9ad 100644
--- a/scripts/build/tools.sh
+++ b/scripts/build/tools.sh
@@ -3,11 +3,15 @@
 # List all tools facilities, and parse their scripts
 CT_TOOLS_FACILITY_LIST=
 for f in "${CT_LIB_DIR}/scripts/build/tools/"*.sh; do
-    is_enabled=
-    . "${f}"
-    f=$(basename "${f}" .sh)
-    if [ "${is_enabled}" = "y" ]; then
-        CT_TOOLS_FACILITY_LIST="${CT_TOOLS_FACILITY_LIST} ${f#???-}"
+    _f="$(basename "${f}" .sh)"
+    _f="${_f#???-}"
+    __f="CT_TOOL_${_f}"
+    if [ "${!__f}" = "y" ]; then
+        CT_DoLog DEBUG "Enabling tool '${_f}'"
+        . "${f}"
+        CT_TOOLS_FACILITY_LIST="${CT_TOOLS_FACILITY_LIST} ${_f}"
+    else
+        CT_DoLog DEBUG "Disabling tool '${_f}'"
     fi
 done
 
diff --git a/scripts/build/tools/000-template.sh b/scripts/build/tools/000-template.sh
index 7edc8071..4a278011 100644
--- a/scripts/build/tools/000-template.sh
+++ b/scripts/build/tools/000-template.sh
@@ -1,19 +1,12 @@
 # Template file for a tool utility
 
-# Check here wether your tool is enabled or not.
-# This will get redefined over and over again for each tool, so don't
-# count on it in the functions below.
-is_enabled="${CT_FOOBAR}"
-
 # Small function to print the filename
 # Note that this function gets redefined over and over again for each tool.
 # It's of no use when building the toolchain proper, but shows all its
 # usefullness when saving the toolchain and building the tarball.
-# You shall not echo anything if you're not enabled!
 # Echo the name of the file, without the extension, below.
 do_print_filename() {
     # For example:
-    # [ "{CT_FOOBAR}" = "y" ] || return 0
     # echo "foobar-${CT_FOOBAR_VERSION}"
     :
 }
diff --git a/scripts/build/tools/100-libelf.sh b/scripts/build/tools/100-libelf.sh
index eeb4b3c5..e8cd9860 100644
--- a/scripts/build/tools/100-libelf.sh
+++ b/scripts/build/tools/100-libelf.sh
@@ -1,9 +1,6 @@
 # Build script for libelf
 
-is_enabled="${CT_LIBELF}"
-
 do_print_filename() {
-    [ "{CT_LIBELF}" = "y" ] || return 0
     echo "libelf-${CT_LIBELF_VERSION}"
 }
 
diff --git a/scripts/build/tools/200-sstrip.sh b/scripts/build/tools/200-sstrip.sh
index b8a9d4b5..461dfcfe 100644
--- a/scripts/build/tools/200-sstrip.sh
+++ b/scripts/build/tools/200-sstrip.sh
@@ -1,7 +1,5 @@
 # This will build and install sstrip to run on host and sstrip target files
 
-is_enabled="${CT_SSTRIP}"
-
 case "${CT_SSTRIP_FROM}" in
     ELFkickers)
         do_print_filename() {