[llvm-branch-commits] [llvm-branch] r293780 - Merging r293230:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Feb  1 10:54:47 2017
New Revision: 293780

URL: http://llvm.org/viewvc/llvm-project?rev=293780&view=rev
Log:
Merging r293230:
------------------------------------------------------------------------
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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_40/   (props changed)
    llvm/branches/release_40/cmake/modules/DetermineGCCCompatible.cmake

Propchange: llvm/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  1 10:54:47 2017
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292117,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292624-292625,292641,292651,292667,292711-292713,292758,293021,293025,293259,293291,293293,293417,293522,293629
+/llvm/trunk:155241,291858-291859,291863,291875,291909,291918,291966,291968,291979,292117,292133,292242,292254-292255,292280,292323,292444,292467,292516,292583,292624-292625,292641,292651,292667,292711-292713,292758,293021,293025,293230,293259,293291,293293,293417,293522,293629

Modified: llvm/branches/release_40/cmake/modules/DetermineGCCCompatible.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_40/cmake/modules/DetermineGCCCompatible.cmake?rev=293780&r1=293779&r2=293780&view=diff
==============================================================================
--- llvm/branches/release_40/cmake/modules/DetermineGCCCompatible.cmake (original)
+++ llvm/branches/release_40/cmake/modules/DetermineGCCCompatible.cmake Wed Feb  1 10:54:47 2017
@@ -7,5 +7,7 @@ if(NOT DEFINED LLVM_COMPILER_IS_GCC_COMP
     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()