Bug 1639815 - Move --with-qemu-exe and --with-cross-lib to python configure. r=froydnj
☠☠ backed out by 2a8a0e281e27 ☠ ☠
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 21 May 2020 10:11:21 +0000
changeset 531524 94877a07905449afb0dac9c6426c6c47bf870e49
parent 531523 d1343cbbfca37e4651a7e3179197b5c4b68c8841
child 531525 89475adf15b6407aca0d1061b09e92a6673196a9
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-qemu-exe and --with-cross-lib to python configure. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D76285
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
@@ -243,29 +243,27 @@ def old_configure_options(*options):
     '--libdir',
     '--prefix',
     '--with-android-distribution-directory',
     '--with-android-max-sdk',
     '--with-android-min-sdk',
     '--with-app-basename',
     '--with-app-name',
     '--with-branding',
-    '--with-cross-lib',
     '--with-debug-label',
     '--with-distribution-id',
     '--with-intl-api',
     '--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-qemu-exe',
     '--with-sixgill',
     '--with-system-icu',
     '--with-system-libevent',
     '--with-system-nspr',
     '--with-system-nss',
     '--with-system-png',
     '--with-system-zlib',
     '--with-user-appdir',
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -653,8 +653,18 @@ def wasm_simd(value, jit_enabled, simula
     if jit_enabled and not simulator:
         if target.cpu == 'x86_64':
             return True
 
     die('--enable-wasm-simd only possible when targeting the x86_64 jit')
 
 set_config('ENABLE_WASM_SIMD', wasm_simd)
 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))
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1440,31 +1440,16 @@ dnl ====================================
 dnl =
 dnl = Standalone module options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))
 
 dnl ========================================================
 dnl =
-dnl = Options for generating the shell as a script
-dnl =
-dnl ========================================================
-
-MOZ_ARG_WITH_STRING(qemu-exe,
-[  --with-qemu-exe=path   Use path as an arm emulator on host platforms],
-    QEMU_EXE=$withval)
-AC_SUBST(QEMU_EXE)
-MOZ_ARG_WITH_STRING(cross-lib,
-[  --with-cross-lib=dir   Use dir as the location for arm libraries],
-    CROSS_LIB=$withval,
-    CROSS_LIB=/usr/$target)
-AC_SUBST(CROSS_LIB)
-dnl ========================================================
-dnl =
 dnl = Maintainer debug option (no --enable equivalent)
 dnl =
 dnl ========================================================
 
 AC_SUBST(NM)
 AC_SUBST_LIST(ASFLAGS)
 AC_SUBST(RCFLAGS)
 AC_SUBST(WINDRES)