Skip to content

Commit 210f332

Browse files
authored
[SYCL][CMake] Apply SYCL_LIBDEVICE_CXX_FLAGS to IMF host compile (#19611)
We need to apply the custom flags both to the libdevice BC file generation and the imf host compile, as these flags could contain paths to stdlibc++ or glibc which are used in both. I forgot to do this in my [change](#19521) adding this flag. --------- Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 04f76af commit 210f332

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

libdevice/cmake/modules/SYCLLibdevice.cmake

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,18 @@ set(compile_opts
5656
set(SYCL_LIBDEVICE_GCC_TOOLCHAIN "" CACHE PATH "Path to GCC installation")
5757

5858
set(SYCL_LIBDEVICE_CXX_FLAGS "" CACHE STRING "C++ compiler flags for SYCL libdevice")
59+
if(NOT SYCL_LIBDEVICE_CXX_FLAGS STREQUAL "")
60+
separate_arguments(SYCL_LIBDEVICE_CXX_FLAGS NATIVE_COMMAND ${SYCL_LIBDEVICE_CXX_FLAGS})
61+
endif()
62+
5963
if (NOT SYCL_LIBDEVICE_GCC_TOOLCHAIN STREQUAL "")
60-
list(APPEND compile_opts "--gcc-install-dir=${SYCL_LIBDEVICE_GCC_TOOLCHAIN}")
64+
list(APPEND SYCL_LIBDEVICE_CXX_FLAGS "--gcc-install-dir=${SYCL_LIBDEVICE_GCC_TOOLCHAIN}")
6165
endif()
66+
6267
if(NOT SYCL_LIBDEVICE_CXX_FLAGS STREQUAL "")
63-
separate_arguments(SYCL_LIBDEVICE_CXX_FLAGS NATIVE_COMMAND ${SYCL_LIBDEVICE_CXX_FLAGS})
6468
list(APPEND compile_opts ${SYCL_LIBDEVICE_CXX_FLAGS})
6569
endif()
70+
6671
if(LLVM_LIBCXX_USED)
6772
list(APPEND compile_opts "-stdlib=libc++")
6873
endif()
@@ -646,12 +651,9 @@ set(imf_bf16_fallback_src ${imf_fallback_src_dir}/imf_bf16_fallback.cpp)
646651
set(imf_host_cxx_flags -c
647652
--target=${LLVM_HOST_TRIPLE}
648653
-D__LIBDEVICE_HOST_IMPL__
654+
${SYCL_LIBDEVICE_CXX_FLAGS}
649655
)
650656

651-
if (NOT SYCL_LIBDEVICE_GCC_TOOLCHAIN STREQUAL "")
652-
list(APPEND imf_host_cxx_flags "--gcc-install-dir=${SYCL_LIBDEVICE_GCC_TOOLCHAIN}")
653-
endif()
654-
655657
if(LLVM_LIBCXX_USED)
656658
list(APPEND imf_host_cxx_flags "-stdlib=libc++")
657659
endif()

0 commit comments

Comments
 (0)