Skip to content

Commit 314eeac

Browse files
authored
Force clang as CMake Assembly compiler, with wasm32-wasi triple (#315)
Sometimes a C codebase might have the odd file written in Assembly. We should force the use of Clang as the assembly compiler for these cases (which it is perfectly capable of doing), and make sure we pass on the WASI compiler triple the same way we do for C and C++.
1 parent 46fe12f commit 314eeac

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

wasi-sdk-pthread.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ endif()
1818

1919
set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
2020
set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
21+
set(CMAKE_ASM_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
2122
set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
2223
set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
2324
set(CMAKE_C_COMPILER_TARGET ${triple})
2425
set(CMAKE_CXX_COMPILER_TARGET ${triple})
26+
set(CMAKE_ASM_COMPILER_TARGET ${triple})
2527

2628
# Don't look in the sysroot for executables to run during the build
2729
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

wasi-sdk.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ endif()
1616

1717
set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
1818
set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
19+
set(CMAKE_ASM_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
1920
set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
2021
set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
2122
set(CMAKE_C_COMPILER_TARGET ${triple})
2223
set(CMAKE_CXX_COMPILER_TARGET ${triple})
24+
set(CMAKE_ASM_COMPILER_TARGET ${triple})
2325

2426
# Don't look in the sysroot for executables to run during the build
2527
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

0 commit comments

Comments
 (0)