diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-19 01:36:07 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-19 01:36:07 +0100 |
| commit | cdea310f1796c1ea5ffa5b49a06fcda914ea9ecb (patch) | |
| tree | 5ddb309f406b6b8fcc9932739b31017941ab4150 | |
| parent | fb96b43b5f6188233710c5f8c9c9e46baa9cb369 (diff) | |
| download | UXP-cdea310f1796c1ea5ffa5b49a06fcda914ea9ecb.tar UXP-cdea310f1796c1ea5ffa5b49a06fcda914ea9ecb.tar.gz UXP-cdea310f1796c1ea5ffa5b49a06fcda914ea9ecb.tar.lz UXP-cdea310f1796c1ea5ffa5b49a06fcda914ea9ecb.tar.xz UXP-cdea310f1796c1ea5ffa5b49a06fcda914ea9ecb.zip | |
Issue #1322 - Part 2: Remove --enable-sm-promise buildconfig switch.
| -rw-r--r-- | build/docs/mozinfo.rst | 8 | ||||
| -rw-r--r-- | js/moz.configure | 13 | ||||
| -rwxr-xr-x | python/mozbuild/mozbuild/mozinfo.py | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/build/docs/mozinfo.rst b/build/docs/mozinfo.rst index d74ca75e6..85ceb6657 100644 --- a/build/docs/mozinfo.rst +++ b/build/docs/mozinfo.rst @@ -136,14 +136,6 @@ release_or_beta Always defined. -sm_promise - Whether spidermonkey promises have been enabled or not. This is set - by adding --enable-sm-promise to the mozconfig file. - - Values are ``true`` and ``false``. - - Always defined. - tests_enabled Whether tests are enabled for this build. diff --git a/js/moz.configure b/js/moz.configure index eadd0e9ab..33bac0017 100644 --- a/js/moz.configure +++ b/js/moz.configure @@ -37,19 +37,6 @@ def js_disable_shell(value): set_config('JS_DISABLE_SHELL', js_disable_shell) -# Use SpiderMonkey Promise implementation if it's enabled -# ======================================================= -js_option('--enable-sm-promise', default=True, - help='Enable SpiderMonkey promises') - -@depends('--enable-sm-promise') -def sm_promise(value): - if value: - return True - -set_config('SPIDERMONKEY_PROMISE', sm_promise) -set_define('SPIDERMONKEY_PROMISE', sm_promise) - # SpiderMonkey as a shared library, and how its symbols are exported # ================================================================== js_option('--disable-shared-js', default=building_js, diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index db46d7c7d..230ca119a 100755 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -91,7 +91,6 @@ def build_dict(config, env=os.environ): d['addon_signing'] = substs.get('MOZ_ADDON_SIGNING') == '1' d['require_signing'] = substs.get('MOZ_REQUIRE_SIGNING') == '1' d['official'] = bool(substs.get('MC_OFFICIAL')) - d['sm_promise'] = bool(substs.get('SPIDERMONKEY_PROMISE')) def guess_platform(): if d['buildapp'] in ('browser', 'mulet'): |