[Bf-blender-cvs] [fc2ea4fd00e] cycles_oneapi: deps_builder: fix dpcpp install failing
Ray Molenkamp
noreply at git.blender.org
Tue May 24 21:29:39 CEST 2022
Commit: fc2ea4fd00e8825a19d07e02d90d12b224748d3a
Author: Ray Molenkamp
Date: Tue May 24 12:15:35 2022 -0600
Branches: cycles_oneapi
https://developer.blender.org/rBfc2ea4fd00e8825a19d07e02d90d12b224748d3a
deps_builder: fix dpcpp install failing
libsycldevice wasn't building and causing
an error during the install phase.
===================================================================
M build_files/build_environment/patches/dpcpp.diff
===================================================================
diff --git a/build_files/build_environment/patches/dpcpp.diff b/build_files/build_environment/patches/dpcpp.diff
index 8f54ab6c02e..a8917911c5d 100644
--- a/build_files/build_environment/patches/dpcpp.diff
+++ b/build_files/build_environment/patches/dpcpp.diff
@@ -38,3 +38,18 @@ diff -Naur llvm-sycl-nightly-20220501.orig\opencl/CMakeLists.txt llvm-sycl-night
+set(FETCHCONTENT_FULLY_DISCONNECTED ON)
add_subdirectory(opencl-aot)
+diff -Naur llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice.cmake llvm-sycl-nightly-20220208/libdevice/cmake/modules/SYCLLibdevice.cmake
+--- llvm-sycl-nightly-20220208.orig/libdevice/cmake/modules/SYCLLibdevice.cmake 2022-02-08 09:17:24 -0700
++++ llvm-sycl-nightly-20220208/libdevice/cmake/modules/SYCLLibdevice.cmake 2022-05-24 11:35:51 -0600
+@@ -246,7 +246,10 @@
+ ${obj_binary_dir}/libsycl-fallback-cmath.${lib-suffix}
+ ${obj_binary_dir}/libsycl-fallback-cmath-fp64.${lib-suffix}
+ )
+-add_custom_target(libsycldevice DEPENDS
++
++# Blender: add ALL here otherwise this target will not build
++# and cause an error due to missing files during the install phase.
++add_custom_target(libsycldevice ALL DEPENDS
+ libsycldevice-obj
+ libsycldevice-fallback-obj
+ libsycldevice-spv)
More information about the Bf-blender-cvs
mailing list