OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Guard color diagnostics opts by compiler type (#98952)

Browse Source 
On Linux system where `/usr/bin/c++` is not a symlink to either `g++` or `clang++`, `try_compile` can still incorrectly identify `gcc` as supporting `-fcolor-diagnostics` flag.

Rather than introducing a super complex condition (i.e. `USE_CCACHE` and `LINUX` ...) just guard the checks specific to compiler identifier.

See https://github.com/ccache/ccache/issues/1275

Fixes https://github.com/pytorch/pytorch/issues/83500

Pull Request resolved: https://github.com/pytorch/pytorch/pull/98952
Approved by: https://github.com/albanD
This commit is contained in:
Nikita Shulga 2023-04-12 23:39:32 +00:00 committed by PyTorch MergeBot
parent ab761605ae
commit a8f5d72edf
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -862,8 +862,15 @@ if(NOT MSVC)
append_cxx_flag_if_supported("-Qunused-arguments" CMAKE_CXX_FLAGS) append_cxx_flag_if_supported("-Qunused-arguments" CMAKE_CXX_FLAGS)
if(${USE_COLORIZE_OUTPUT}) if(${USE_COLORIZE_OUTPUT})
append_cxx_flag_if_supported("-fcolor-diagnostics" CMAKE_CXX_FLAGS) # Why compiler checks are necessary even when `try_compile` is used
append_cxx_flag_if_supported("-fdiagnostics-color=always" CMAKE_CXX_FLAGS) # Because of the bug in ccache that can incorrectly identify `-fcolor-diagnostics`
# As supported by GCC, see https://github.com/ccache/ccache/issues/740 (for older ccache)
# and https://github.com/ccache/ccache/issues/1275 (for newer ones)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
append_cxx_flag_if_supported("-fdiagnostics-color=always" CMAKE_CXX_FLAGS)
else()
append_cxx_flag_if_supported("-fcolor-diagnostics" CMAKE_CXX_FLAGS)
endif()
endif() endif()
append_cxx_flag_if_supported("-faligned-new" CMAKE_CXX_FLAGS) append_cxx_flag_if_supported("-faligned-new" CMAKE_CXX_FLAGS)