]> granicus.if.org Git - llvm/commitdiff
Merging r293230:
authorHans Wennborg <hans@hanshq.net>
Wed, 1 Feb 2017 16:54:47 +0000 (16:54 +0000)
committerHans Wennborg <hans@hanshq.net>
Wed, 1 Feb 2017 16:54:47 +0000 (16:54 +0000)
------------------------------------------------------------------------
r293230 | yuyichao | 2017-01-26 15:50:18 -0800 (Thu, 26 Jan 2017) | 11 lines

CMake is funky on detecting Intel 17 as GCC compatible.

Summary: This adds a fallback in case that the Intel compiler is failed to be detected correctly.

Reviewers: chapuni

Reviewed By: chapuni

Subscribers: llvm-commits, mgorny

Differential Revision: https://reviews.llvm.org/D27610
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_40@293780 91177308-0d34-0410-b5e6-96231b3b80d8

cmake/modules/DetermineGCCCompatible.cmake

index 1bf15fcba72f0ed033552ac6f4f561b24f591dbf..1369ebe9d0e212e57dcbf7f82a5d94d201a48eaf 100644 (file)
@@ -7,5 +7,7 @@ if(NOT DEFINED LLVM_COMPILER_IS_GCC_COMPATIBLE)
     set(LLVM_COMPILER_IS_GCC_COMPATIBLE OFF)
   elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
     set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
+  elseif( "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel" )
+    set(LLVM_COMPILER_IS_GCC_COMPATIBLE ON)
   endif()
 endif()