Skip to content

Commit

Permalink
Add LLVM patch to correctly recognise ICC17 as GCC compatible. (Julia…
Browse files Browse the repository at this point in the history
  • Loading branch information
vchuravy authored and tkelman committed Jan 29, 2017
1 parent 3de7fc8 commit a087c38
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
1 change: 1 addition & 0 deletions deps/llvm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ $(eval $(call LLVM_PATCH,llvm-D27397)) # Julia issue #19792, Remove for 4.0
$(eval $(call LLVM_PATCH,llvm-D28009)) # Julia issue #19792, Remove for 4.0
$(eval $(call LLVM_PATCH,llvm-D28215_FreeBSD_shlib))
$(eval $(call LLVM_PATCH,llvm-D28221-avx512)) # mentioned in issue #19797
$(eval $(call LLVM_PATCH,llvm-rL293230-icc17-cmake)) # Remove for 5.0
endif # LLVM_VER

ifeq ($(LLVM_VER),3.7.1)
Expand Down
35 changes: 35 additions & 0 deletions deps/patches/llvm-rL293230-icc17-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From eca8aa608d962e09ea9710670f1c412f608a6f12 Mon Sep 17 00:00:00 2001
From: Yichao Yu <[email protected]>
Date: Thu, 26 Jan 2017 23:50:18 +0000
Subject: [PATCH] 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/trunk@293230 91177308-0d34-0410-b5e6-96231b3b80d8
---
cmake/modules/DetermineGCCCompatible.cmake | 2 ++
1 file changed, 2 insertions(+)

diff --git a/cmake/modules/DetermineGCCCompatible.cmake b/cmake/modules/DetermineGCCCompatible.cmake
index 1bf15fcba72..1369ebe9d0e 100644
--- a/cmake/modules/DetermineGCCCompatible.cmake
+++ b/cmake/modules/DetermineGCCCompatible.cmake
@@ -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()
--
2.11.0

0 comments on commit a087c38

Please sign in to comment.