--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1279,17 +1279,23 @@ def is_linker_option_enabled(target):
         return True
 
 
 option('--enable-gold',
        env='MOZ_FORCE_GOLD',
        help='Enable GNU Gold Linker when it is not already the default',
        when=is_linker_option_enabled)
 
-imply_option('--enable-linker', 'gold', when='--enable-gold')
+# This simple wrapper is needed so --enable-gold is registered with help.
+@depends('--enable-gold', when=is_linker_option_enabled)
+def gold(flag):
+    if flag:
+        return flag
+
+imply_option('--enable-linker', 'gold', when=gold)
 
 
 @imports('os')
 @imports('shutil')
 def enable_gnu_linker(enable_gold_option, c_compiler, developer_options, build_env,
                       toolchain_flags, linker_name):
     # Used to check the kind of linker
     version_check = ['-Wl,--version']