diff options
author | NAKAMURA Takumi <geek4civic@gmail.com> | 2017-05-11 13:19:24 +0000 |
---|---|---|
committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2017-05-11 13:19:24 +0000 |
commit | 25f1a6ed16db75b5ba53cc42c23364c693ca4096 (patch) | |
tree | 102b402d67cdb160531dacf31b5ab04d930a10a2 /clang/CMakeLists.txt | |
parent | f3d7904d20120fb6e4b33cd391b916ca6701e03e (diff) |
Fix two-stage build on windows using DistributionExample cmake cache
Thanks to Matthew Larionov <matthewtff@gmail.com>
llvm-svn: 302795
Diffstat (limited to 'clang/CMakeLists.txt')
-rw-r--r-- | clang/CMakeLists.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index ca696b1ce79f..9e43a103b2bc 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -579,10 +579,17 @@ if (CLANG_ENABLE_BOOTSTRAP) add_dependencies(clang-bootstrap-deps compiler-rt) endif() + set(C_COMPILER "clang") + set(CXX_COMPILER "clang++") + if(WIN32) + set(C_COMPILER "clang-cl.exe") + set(CXX_COMPILER "clang-cl.exe") + endif() + set(COMPILER_OPTIONS - -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++ - -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang - -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) + -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}) if(BOOTSTRAP_LLVM_BUILD_INSTRUMENTED) add_dependencies(clang-bootstrap-deps llvm-profdata) |