diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index 79ad118f0e40..943879951cef 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -259,7 +259,6 @@ def old_configure_options(*options):
     '--with-nspr-prefix',
     '--with-nss-exec-prefix',
     '--with-nss-prefix',
-    '--with-sixgill',
     '--with-system-icu',
     '--with-system-libevent',
     '--with-system-nspr',
diff --git a/js/moz.configure b/js/moz.configure
index d8f3b74f127a..a583d246c791 100644
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -668,3 +668,18 @@ set_config('QEMU_EXE', depends_if('--with-qemu-exe')(lambda x: x))
 js_option('--with-cross-lib', nargs=1, default=depends(target.alias)(lambda x: '/usr/%s' % x),
           help='Use dir as the location for arm libraries')
 set_config('CROSS_LIB', depends_if('--with-cross-lib')(lambda x: x))
+
+# Enable static checking using sixgill
+# ====================================
+
+js_option('--with-sixgill', nargs=1, help='Enable static checking of code using sixgill')
+
+@depends_if('--with-sixgill')
+@imports('os')
+def sixgill(value):
+    for f in ('bin/xdbfind', 'gcc/xgill.so', 'scripts/wrap_gcc/g++'):
+        if not os.path.exists(os.path.join(value[0], f)):
+            die('The sixgill plugin and binaries are not at the specified path')
+    return value[0]
+
+set_config('SIXGILL_PATH', sixgill)
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 064cee0a9bbc..83917408c578 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1285,23 +1285,6 @@ if test -n "$COMPILE_ENVIRONMENT"; then
 MOZ_CONFIG_CLANG_PLUGIN
 fi # COMPILE_ENVIRONMENT
 
-dnl ========================================================
-dnl = Enable static checking using sixgill
-dnl ========================================================
-
-MOZ_ARG_WITH_STRING(sixgill,
-[  --with-sixgill=path/to/sixgill
-                          Enable static checking of code using sixgill],
-    SIXGILL_PATH=$withval,
-    SIXGILL_PATH= )
-
-if test -n "$SIXGILL_PATH"; then
-    if test ! -x "$SIXGILL_PATH/bin/xdbfind" || test ! -f "$SIXGILL_PATH/gcc/xgill.so" || test ! -x "$SIXGILL_PATH/scripts/wrap_gcc/g++"; then
-        AC_MSG_ERROR([The sixgill plugin and binaries are not at the specified path.])
-    fi
-fi
-AC_SUBST(SIXGILL_PATH)
-
 dnl ========================================================
 dnl = Enable stripping of libs & executables
 dnl ========================================================