diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-14 19:41:05 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2013-06-14 19:41:05 +0000 |
| commit | d132ce7a7503b38fc6dad7f4e1b3f6b7173e90a6 (patch) | |
| tree | 344c5fd59450ca1fb4dfa2f0bb265d15af773fcf /cmake | |
| parent | fcba9c56a25edc71e32a407dfd6191de6dba0ed7 (diff) | |
| download | external_llvm-d132ce7a7503b38fc6dad7f4e1b3f6b7173e90a6.zip external_llvm-d132ce7a7503b38fc6dad7f4e1b3f6b7173e90a6.tar.gz external_llvm-d132ce7a7503b38fc6dad7f4e1b3f6b7173e90a6.tar.bz2 | |
Revert "Cmake: add compiler option in a more idiomatic way"
This reverts commit 183995.
It broke the bots:
http://bb.pgr.jp/builders/cmake-clang-x86_64-linux/builds/9730/steps/build_clang/logs/stdio
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183997 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/HandleLLVMOptions.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index b336324..2939fa2 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -268,6 +268,8 @@ add_llvm_definitions( -D__STDC_FORMAT_MACROS ) add_llvm_definitions( -D__STDC_LIMIT_MACROS ) # clang doesn't print colored diagnostics when invoked from Ninja -if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja") - add_flag_if_supported("-fcolor-diagnostics") +if (UNIX AND + CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND + CMAKE_GENERATOR STREQUAL "Ninja") + append("-fcolor-diagnostics" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) endif() |