[llvm] r332793 - Enable colored diagnostics in ninja builds when building with gcc 4.9+.
Nico Weber via llvm-commits
llvm-commits at lists.llvm.org
Fri May 18 19:36:27 PDT 2018
Author: nico
Date: Fri May 18 19:36:27 2018
New Revision: 332793
URL: http://llvm.org/viewvc/llvm-project?rev=332793&view=rev
Log:
Enable colored diagnostics in ninja builds when building with gcc 4.9+.
GCC has supported -fdiagnostics-color since 4.9.
https://reviews.llvm.org/D47083
Modified:
llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=332793&r1=332792&r2=332793&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Fri May 18 19:36:27 2018
@@ -720,11 +720,13 @@ add_definitions( -D__STDC_CONSTANT_MACRO
add_definitions( -D__STDC_FORMAT_MACROS )
add_definitions( -D__STDC_LIMIT_MACROS )
-# clang doesn't print colored diagnostics when invoked from Ninja
+# clang and gcc don't default-print colored diagnostics when invoked from Ninja.
if (UNIX AND
- CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND
- CMAKE_GENERATOR STREQUAL "Ninja")
- append("-fcolor-diagnostics" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+ CMAKE_GENERATOR STREQUAL "Ninja" AND
+ (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
+ (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND
+ NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9))))
+ append("-fdiagnostics-color" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
endif()
# lld doesn't print colored diagnostics when invoked from Ninja
More information about the llvm-commits
mailing list