Bug 1639815 - Move --with-sixgill to python configure. r=froydnj
☠☠ backed out by 2a8a0e281e27 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 21 May 2020 10:10:31 +0000
changeset 531525 89475adf15b6407aca0d1061b09e92a6673196a9
parent 531524 94877a07905449afb0dac9c6426c6c47bf870e49
child 531526 16447c6787497e93ed133018a58da018e449c3c4
push id37440
push userabutkovits@mozilla.com
push dateFri, 22 May 2020 09:43:16 +0000
treeherdermozilla-central@fbf71e4d2e21 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1639815
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1639815 - Move --with-sixgill to python configure. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D76286
build/moz.configure/old.configure
js/moz.configure
js/src/old-configure.in
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -254,17 +254,16 @@ def old_configure_options(*options):
     '--with-jitreport-granularity',
     '--with-macbundlename-prefix',
     '--with-nspr-cflags',
     '--with-nspr-exec-prefix',
     '--with-nspr-libs',
     '--with-nspr-prefix',
     '--with-nss-exec-prefix',
     '--with-nss-prefix',
-    '--with-sixgill',
     '--with-system-icu',
     '--with-system-libevent',
     '--with-system-nspr',
     '--with-system-nss',
     '--with-system-png',
     '--with-system-zlib',
     '--with-user-appdir',
     '--x-includes',
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -663,8 +663,23 @@ set_define('ENABLE_WASM_SIMD', wasm_simd
 # Options for generating the shell as a script
 # ============================================
 js_option('--with-qemu-exe', nargs=1, help='Use path as an arm emulator on host platforms')
 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)
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1281,33 +1281,16 @@ dnl ====================================
 dnl = Enable using the clang plugin to build
 dnl ========================================================
 
 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 ========================================================
 MOZ_ARG_ENABLE_BOOL(strip,
 [  --enable-strip          Enable stripping of libs & executables ],
     ENABLE_STRIP=1,
     ENABLE_STRIP= )
 
 dnl ========================================================