diff options
| author | Don Hinton <hintonda@gmail.com> | 2018-01-19 18:31:12 +0000 |
|---|---|---|
| committer | Don Hinton <hintonda@gmail.com> | 2018-01-19 18:31:12 +0000 |
| commit | 976f05166f619f005440af583c261e4013695cd7 (patch) | |
| tree | a82b15702f76f85c85966a61460c64fd2c952507 /clang/CMakeLists.txt | |
| parent | 272c70179a98179e0b10801496e905f414407865 (diff) | |
[cmake] Also pass CMAKE_ASM_COMPILER_ID to next stage when bootstrapping
Summary:
When setting CMAKE_ASM_COMPILER=clang, we also need to set
CMAKE_ASM_COMPILER_ID=Clang.
This is needed because cmake won't set CMAKE_ASM_COMPILER_ID if
CMAKE_ASM_COMPILER is already set.
Without CMAKE_ASM_COMPILER_ID, cmake can't set
CMAKE_ASM_COMPILER_OPTIONS_TARGET either, which means
CMAKE_ASM_COMPILER_TARGET is ignored, causing cross compiling to fail,
i.e., `--target=${CMAKE_ASM_COMPILER_TARGET}` isn't passed.
Differential Revision: https://reviews.llvm.org/D42232
llvm-svn: 322977
Diffstat (limited to 'clang/CMakeLists.txt')
| -rw-r--r-- | clang/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 2eee8e6148f7..a2fcaec9c394 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -624,7 +624,8 @@ if (CLANG_ENABLE_BOOTSTRAP) set(COMPILER_OPTIONS -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${CXX_COMPILER} -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER} - -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER}) + -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER} + -DCMAKE_ASM_COMPILER_ID=Clang) if(BOOTSTRAP_LLVM_BUILD_INSTRUMENTED) add_dependencies(clang-bootstrap-deps llvm-profdata) |