[PATCH] D99794: libclc: Add -cl-no-stdinc to clang flags on clang >=13

[Jan Vesely via Phabricator via llvm-commits]

jvesely created this revision.
jvesely added a reviewer: tstellar.
Herald added subscribers: Anastasia, mgorny.
jvesely requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce <https://reviews.llvm.org/rGcf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce> ("[OpenCL] Add builtin
declarations by default.")
 switched behaviour to include "opencl-c-base.h". We don't want or need
 that for libclc so pass the flag to revert to old behaviour.

Fixes build since cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce <https://reviews.llvm.org/rGcf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D99794

Files:
  libclc/CMakeLists.txt


Index: libclc/CMakeLists.txt
===================================================================
--- libclc/CMakeLists.txt
+++ libclc/CMakeLists.txt
@@ -124,7 +124,6 @@
 set( CMAKE_LLAsm_PREPROCESSOR ${LLVM_CLANG} )
 set( CMAKE_LLAsm_COMPILER ${LLVM_AS} )
 set( CMAKE_LLAsm_ARCHIVE ${LLVM_LINK} )
-enable_language( CLC LLAsm )
 
 # Construct LLVM version define
 string( REPLACE "." ";" LLVM_VERSION_LIST ${LLVM_VERSION} )
@@ -132,6 +131,15 @@
 list( GET LLVM_VERSION_LIST 1 LLVM_MINOR )
 set( LLVM_VERSION_DEFINE "-DHAVE_LLVM=0x${LLVM_MAJOR}0${LLVM_MINOR}" )
 
+
+# LLVM 13 enables standard includes by default
+if( ${LLVM_VERSION} VERSION_GREATER "12.99.99" )
+				set( CMAKE_LLAsm_FLAGS ${CMAKE_LLAsm_FLAGS} -cl-no-stdinc )
+				set( CMAKE_CLC_FLAGS ${CMAKE_CLC_FLAGS} -cl-no-stdinc )
+endif()
+
+enable_language( CLC LLAsm )
+
 # This needs to be set before any target that needs it
 link_directories( ${LLVM_LIBDIR} )
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D99794.334948.patch
Type: text/x-patch
Size: 925 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210402/73b93040/attachment.bin>