Author: Jan Vesely Date: 2021-07-15T10:43:26+10:00 New Revision: ea469b08b847cef5f4c8187228f1e4bbf881706a
URL: https://github.com/llvm/llvm-project/commit/ea469b08b847cef5f4c8187228f1e4bbf881706a DIFF: https://github.com/llvm/llvm-project/commit/ea469b08b847cef5f4c8187228f1e4bbf881706a.diff LOG: libclc: Add -cl-no-stdinc to clang flags on clang >=13 cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce ("[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 Reviewed By: tstellar Differential Revision: https://reviews.llvm.org/D99794 Added: Modified: libclc/CMakeLists.txt Removed: ################################################################################ diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt index 7f8d81e9036ab..ec39ea63f2d02 100644 --- a/libclc/CMakeLists.txt +++ b/libclc/CMakeLists.txt @@ -124,7 +124,6 @@ set( CMAKE_CLC_ARCHIVE ${LLVM_LINK} ) 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 0 LLVM_MAJOR ) 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} ) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
