3 files changed, 12 insertions, 13 deletions
diff --git a/config/global/download.in b/config/global/download.in
index 89b05cea..57f42e6f 100644
--- a/config/global/download.in
+++ b/config/global/download.in
@@ -135,6 +135,7 @@ endif # USE_MIRROR
 config VERIFY_DOWNLOAD_DIGEST
     bool "Verify download digests (checksums)"
     default y
+    depends on CONFIGURE_has_sha512sum || CONFIGURE_has_sha256sum || CONFIGURE_has_sha1sum || CONFIGURE_has_md5sum
 
 if VERIFY_DOWNLOAD_DIGEST
 
@@ -143,14 +144,18 @@ choice
 
 config VERIFY_DOWNLOAD_DIGEST_SHA512
     bool "SHA-512"
+    depends on CONFIGURE_has_sha512sum
 
 config VERIFY_DOWNLOAD_DIGEST_SHA256
+    depends on CONFIGURE_has_sha256sum
     bool "SHA-256"
 
 config VERIFY_DOWNLOAD_DIGEST_SHA1
+    depends on CONFIGURE_has_sha1sum
     bool "SHA-1"
 
 config VERIFY_DOWNLOAD_DIGEST_MD5
+    depends on CONFIGURE_has_md5sum
     bool "MD5"
 
 endchoice
diff --git a/config/global/extract.in b/config/global/extract.in
index 58f7b956..ba7f5f4c 100644
--- a/config/global/extract.in
+++ b/config/global/extract.in
@@ -40,19 +40,16 @@ config ONLY_EXTRACT
       Useful to look at the code before doing the build itself.
 
 choice
-    prompt "Patches origin"
-    bool
+    bool "Patches origin"
     default PATCH_BUNDLED
 
 config PATCH_BUNDLED
-    bool
-    prompt "Bundled only"
+    bool "Bundled only"
     help
       Only apply patches bundled with crosstool-NG.
 
 config PATCH_LOCAL
-    bool
-    prompt "Local only (EXPERIMENTAL)"
+    bool "Local only"
     select PATCH_USE_LOCAL
     depends on EXPERIMENTAL
     help
@@ -61,16 +58,14 @@ config PATCH_LOCAL
       copy them into your local directory if needed.
 
 config PATCH_BUNDLED_LOCAL
-    bool
-    prompt "Bundled, then local"
+    bool "Bundled, then local"
     select PATCH_USE_LOCAL
     help
       Apply the patches bundled with crosstool-NG, then apply your local
       patches.
 
 config PATCH_LOCAL_BUNDLED
-    bool
-    prompt "Local, then bundled"
+    bool "Local, then bundled"
     select PATCH_USE_LOCAL
     depends on EXPERIMENTAL
     help
@@ -79,8 +74,7 @@ config PATCH_LOCAL_BUNDLED
       to apply on top of your local patches.
 
 config PATCH_NONE
-    bool
-    prompt "None"
+    bool "None"
     depends on EXPERIMENTAL
     help
       Don't use any patch at all.
diff --git a/config/global/paths.in b/config/global/paths.in
index 39e15f35..b4e93ee0 100644
--- a/config/global/paths.in
+++ b/config/global/paths.in
@@ -42,7 +42,7 @@ config WORK_DIR
 
 config BUILD_TOP_DIR
     string
-    default "${CT_WORK_DIR}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
+    default "${CT_WORK_DIR:-${CT_TOP_DIR}/.build}/${CT_HOST:+HOST-${CT_HOST}/}${CT_TARGET}"
 
 config PREFIX_DIR
     string