@@ -, +, @@ 
---
 toolkit/moz.configure | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
--- a/toolkit/moz.configure	
+++ a/toolkit/moz.configure	
@@ -1266,12 +1266,11 @@ with only_when('--enable-compile-environment'):
     def default_elfhack(release):
         return bool(release)
 
-    with only_when(has_elfhack):
-        option('--disable-elf-hack', default=default_elfhack,
-               help='Disable elf hacks')
+    option('--disable-elf-hack', default=default_elfhack,
+           help='Disable elf hacks')
 
-        set_config('USE_ELF_HACK',
-                   depends_if('--enable-elf-hack')(lambda _: True))
+    set_config('USE_ELF_HACK',
+               depends_if('--enable-elf-hack')(lambda _: True))
 
 
 @depends(check_build_environment)
--