[PATCH] D105419: libclc: fix build since recent opencl-c-base.h default include changes.

[Dave Airlie via Phabricator via llvm-commits]

airlied created this revision.
airlied added a reviewer: Anastasia.
Herald added subscribers: ldrumm, jvesely, kristof.beyls, yaxunl, mgorny.
airlied requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Since cf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce <https://reviews.llvm.org/rGcf3ef15a6ec5e5b45c6c54e8fbe3769255e815ce>
Author: Anastasia Stulova <anastasia.stulova at arm.com>
Date:   Mon Feb 22 11:05:52 2021 +0000

  [OpenCL] Add builtin declarations by default.

libclc won't configure or build.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D105419

Files:
  libclc/CMakeLists.txt
  libclc/cmake/CMakeLLAsmInformation.cmake


Index: libclc/cmake/CMakeLLAsmInformation.cmake
===================================================================
--- libclc/cmake/CMakeLLAsmInformation.cmake
+++ libclc/cmake/CMakeLLAsmInformation.cmake
@@ -1,6 +1,6 @@
 if(NOT CMAKE_LLAsm_COMPILE_OBJECT)
   set(CMAKE_LLAsm_COMPILE_OBJECT
-	  "${CMAKE_LLAsm_PREPROCESSOR} -E -P  <DEFINES> <INCLUDES> <FLAGS> -x cl <SOURCE> -o <OBJECT>.temp"
+	  "${CMAKE_LLAsm_PREPROCESSOR} -E -P -cl-no-stdinc <DEFINES> <INCLUDES> <FLAGS> -x cl <SOURCE> -o <OBJECT>.temp"
 	  "<CMAKE_LLAsm_COMPILER> -o <OBJECT> <OBJECT>.temp")
 endif()
 
Index: libclc/CMakeLists.txt
===================================================================
--- libclc/CMakeLists.txt
+++ libclc/CMakeLists.txt
@@ -310,7 +310,7 @@
 		target_compile_definitions( builtins.link.${arch_suffix} PRIVATE
 			${CLC_TARGET_DEFINE} )
 		target_compile_options( builtins.link.${arch_suffix} PRIVATE  -target
-			${t} ${mcpu} -fno-builtin -nostdlib ${build_flags} )
+			${t} ${mcpu} -cl-no-stdinc -fno-builtin -nostdlib ${build_flags} )
 		set_target_properties( builtins.link.${arch_suffix} PROPERTIES
 			LINKER_LANGUAGE CLC )
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D105419.356441.patch
Type: text/x-patch
Size: 1135 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210705/c1beeb4d/attachment.bin>