diff options
| -rw-r--r-- | js/src/moz.build | 23 | ||||
| -rw-r--r-- | js/src/wasm/moz.build | 39 |
2 files changed, 22 insertions, 40 deletions
diff --git a/js/src/moz.build b/js/src/moz.build index 8b51e8b50b..db1b9ba2c9 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -113,7 +113,6 @@ DIRS += [ 'perf', 'proxy', 'threading', - 'wasm', ] if CONFIG['JS_BUNDLED_EDITLINE']: @@ -205,6 +204,28 @@ SOURCES += [ 'vm/Value.cpp', 'vm/WeakMapPtr.cpp', 'vm/Xdr.cpp', + 'wasm/AsmJS.cpp', + 'wasm/WasmBaselineCompile.cpp', + 'wasm/WasmBinaryFormat.cpp', + 'wasm/WasmBinaryIterator.cpp', + 'wasm/WasmBinaryToAST.cpp', + 'wasm/WasmBinaryToExperimentalText.cpp', + 'wasm/WasmBinaryToText.cpp', + 'wasm/WasmCode.cpp', + 'wasm/WasmCompartment.cpp', + 'wasm/WasmCompile.cpp', + 'wasm/WasmFrameIterator.cpp', + 'wasm/WasmGenerator.cpp', + 'wasm/WasmInstance.cpp', + 'wasm/WasmIonCompile.cpp', + 'wasm/WasmJS.cpp', + 'wasm/WasmModule.cpp', + 'wasm/WasmSignalHandlers.cpp', + 'wasm/WasmStubs.cpp', + 'wasm/WasmTable.cpp', + 'wasm/WasmTextToBinary.cpp', + 'wasm/WasmTextUtils.cpp', + 'wasm/WasmTypes.cpp' ] # jsarray.cpp and jsatom.cpp cannot be built in unified mode because diff --git a/js/src/wasm/moz.build b/js/src/wasm/moz.build deleted file mode 100644 index 6a47df3229..0000000000 --- a/js/src/wasm/moz.build +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -include('../js-config.mozbuild') -include('../js-cxxflags.mozbuild') - -FINAL_LIBRARY = "js" - -# Includes should be relative to parent path -LOCAL_INCLUDES += ["!..", ".."] - -SOURCES += [ - 'AsmJS.cpp', - 'WasmBaselineCompile.cpp', - 'WasmBinaryFormat.cpp', - 'WasmBinaryToAST.cpp', - 'WasmBinaryToExperimentalText.cpp', - 'WasmBinaryToText.cpp', - 'WasmCode.cpp', - 'WasmCompartment.cpp', - 'WasmCompile.cpp', - 'WasmFrameIterator.cpp', - 'WasmGenerator.cpp', - 'WasmInstance.cpp', - 'WasmIonCompile.cpp', - 'WasmJS.cpp', - 'WasmModule.cpp', - 'WasmSignalHandlers.cpp', - 'WasmStubs.cpp', - 'WasmTable.cpp', - 'WasmTextToBinary.cpp', - 'WasmTextUtils.cpp', - 'WasmTypes.cpp' -] - -if CONFIG['MOZ_DEBUG']: - SOURCES += ['WasmBinaryIterator.cpp']
\ No newline at end of file |