Bug 1554056 - Don't allow --enable-shared-js outside of standalone spidermonkey builds. r=dmajor
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 28 May 2019 18:45:03 +0000
changeset 535642 e78c08a8a56c85a7a1e9e86364f672ea8e93cf73
parent 535641 57f0a1d67c3eb45ad02c37451096c6df28dd2c1a
child 535643 3edc5be703bef8ad5e78a0ec9b08e98c69cf026b
push id11522
push userffxbld-merge
push dateMon, 01 Jul 2019 09:00:55 +0000
treeherdermozilla-beta@53ea74d2bd09 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdmajor
bugs1554056
milestone69.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 1554056 - Don't allow --enable-shared-js outside of standalone spidermonkey builds. r=dmajor The option has presumably not worked for at least a year, and was seldom used. Differential Revision: https://phabricator.services.mozilla.com/D32418
js/moz.configure
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -43,47 +43,47 @@ set_config('JS_DISABLE_SHELL', js_disabl
 set_define('JS_64BIT', depends(target)(lambda t: t.bitness == 64 or None))
 
 set_define('JS_PUNBOX64', depends(target)(lambda t: t.bitness == 64 or None))
 set_define('JS_NUNBOX32', depends(target)(lambda t: t.bitness == 32 or None))
 
 
 # SpiderMonkey as a shared library, and how its symbols are exported
 # ==================================================================
-js_option('--disable-shared-js', default=building_js,
+js_option('--disable-shared-js', when=js_standalone,
           help='{Create|Do not create} a shared library')
 
-js_option('--disable-export-js', default=building_js,
+js_option('--disable-export-js', when=js_standalone,
           help='{Mark|Do not mark} JS symbols as DLL exported/visible')
 
-@depends('--disable-shared-js', '--disable-export-js')
+@depends('--disable-shared-js', '--disable-export-js', when=js_standalone)
 def shared_js(shared_js, export_js):
     if shared_js:
         if not export_js:
             die('Must export JS symbols when building a shared library.')
         return True
 
 set_config('JS_SHARED_LIBRARY', shared_js)
 add_old_configure_assignment('JS_SHARED_LIBRARY', shared_js)
 
-@depends('--disable-shared-js', '--disable-export-js')
+@depends(shared_js, '--disable-export-js', when=js_standalone)
 def exportable_js_api(shared_js, export_js):
     if not shared_js and export_js:
         return True
 
 set_define('STATIC_EXPORTABLE_JS_API', exportable_js_api)
 
-@depends('--disable-shared-js', '--disable-export-js')
+@depends(shared_js, exportable_js_api)
 def static_js_api(shared_js, export_js):
     if not shared_js and not export_js:
         return True
 
 set_define('STATIC_JS_API', static_js_api)
 
-@depends('--disable-shared-js')
+@depends(shared_js)
 def static_js(value):
     if not value:
         return True
 
 set_define('MOZ_STATIC_JS', static_js)
 
 @deprecated_option(env='DISABLE_SHARED_JS', nargs='?')
 def disable_shared_js(value):