Bug 1525876: Move ENABLE_WASM_CRANELIFT build test in the wasm mozbuild; r=tcampbell
authorBenjamin Bouvier <benj@benj.me>
Wed, 13 Feb 2019 13:52:07 +0000
changeset 458903 9b872b266b2e
parent 458902 1bb3f6cdfa73
child 458904 5add2761a3b6
push id35551
push usershindli@mozilla.com
push dateWed, 13 Feb 2019 21:34:09 +0000
treeherdermozilla-central@08f794a4928e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstcampbell
bugs1525876
milestone67.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 1525876: Move ENABLE_WASM_CRANELIFT build test in the wasm mozbuild; r=tcampbell Differential Revision: https://phabricator.services.mozilla.com/D19648
js/src/moz.build
js/src/wasm/moz.build
--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -417,22 +417,16 @@ DIRS += [
     'frontend/binsource',
     'gc',
     'jit',
     'wasm',
 ]
 
 FINAL_LIBRARY = 'js'
 
-if CONFIG['ENABLE_WASM_CRANELIFT']:
-    DIRS += ['rust']
-    UNIFIED_SOURCES += [
-        'wasm/WasmCraneliftCompile.cpp',
-    ]
-
 # Prepare self-hosted JS code for embedding
 GENERATED_FILES += [('selfhosted.out.h', 'selfhosted.js')]
 selfhosted = GENERATED_FILES[('selfhosted.out.h', 'selfhosted.js')]
 selfhosted.script = 'builtin/embedjs.py:generate_selfhosted'
 selfhosted.inputs = [
     'js.msg',
     'builtin/TypedObjectConstants.h',
     'builtin/SelfHostingDefines.h',
--- a/js/src/wasm/moz.build
+++ b/js/src/wasm/moz.build
@@ -10,16 +10,22 @@ FINAL_LIBRARY = 'js'
 LOCAL_INCLUDES += [
     '!..',
     '..'
 ]
 
 include('../js-config.mozbuild')
 include('../js-cxxflags.mozbuild')
 
+if CONFIG['ENABLE_WASM_CRANELIFT']:
+    DIRS += ['../rust']
+    UNIFIED_SOURCES += [
+        'WasmCraneliftCompile.cpp',
+    ]
+
 UNIFIED_SOURCES += [
     'AsmJS.cpp',
     'WasmBaselineCompile.cpp',
     'WasmBuiltins.cpp',
     'WasmCode.cpp',
     'WasmCompile.cpp',
     'WasmDebug.cpp',
     'WasmFrameIter.cpp',