Skip to content

Commit 2d75aa8

Browse files
authored
Remove use of llvm-mc (#18298)
llvm-mc is more an internal LLVM tool than a user-facing replacement for as. Instead just use clang in the file packager (the one place we need to build assembly files).
1 parent 4c7438a commit 2d75aa8

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

tools/file_packager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ def generate_object_file(data_files):
345345
target = 'wasm64-unknown-emscripten'
346346
else:
347347
target = 'wasm32-unknown-emscripten'
348-
shared.check_call([shared.LLVM_MC,
349-
'-filetype=obj',
350-
'-triple=' + target,
348+
shared.check_call([shared.EMCC,
349+
'-c',
350+
'--target=' + target,
351351
'-o', options.obj_output,
352352
asm_file])
353353

tools/shared.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,6 @@ def get_llvm_target():
747747
LLVM_RANLIB = build_llvm_tool_path(exe_suffix('llvm-ranlib'))
748748
LLVM_OPT = os.path.expanduser(build_llvm_tool_path(exe_suffix('opt')))
749749
LLVM_NM = os.path.expanduser(build_llvm_tool_path(exe_suffix('llvm-nm')))
750-
LLVM_MC = os.path.expanduser(build_llvm_tool_path(exe_suffix('llvm-mc')))
751750
LLVM_DWARFDUMP = os.path.expanduser(build_llvm_tool_path(exe_suffix('llvm-dwarfdump')))
752751
LLVM_OBJCOPY = os.path.expanduser(build_llvm_tool_path(exe_suffix('llvm-objcopy')))
753752
LLVM_STRIP = os.path.expanduser(build_llvm_tool_path(exe_suffix('llvm-strip')))

0 commit comments

Comments
 (0)