I invented CMAKE_BINARY_PATH as the path to clang/llvm-as/llvm-link in last patch, it is not elegant. Actually, LLVM_INSTALL_DIR is already used in CMake file and is a better choice.
So, for cross compile case, cmake can find the binaries such as clang, llvm-as, llvm-link and llvm-config with the help of LLVM_INSTALL_DIR. Signed-off-by: Guo Yejun <[email protected]> --- backend/src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/CMakeLists.txt b/backend/src/CMakeLists.txt index 6090174..1f2822d 100644 --- a/backend/src/CMakeLists.txt +++ b/backend/src/CMakeLists.txt @@ -58,8 +58,8 @@ set (clang_cmd ${clang_cmd} -fno-builtin -DGEN7_SAMPLER_CLAMP_BORDER_WORKAROUND) add_custom_command( OUTPUT ${pch_object} COMMAND rm -f ${pch_object} - COMMAND ${CMAKE_BINARY_PATH}clang ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object} - COMMAND ${CMAKE_BINARY_PATH}clang ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object} + COMMAND ${LLVM_INSTALL_DIR}clang ${clang_cmd} --relocatable-pch -emit-pch -isysroot ${CMAKE_CURRENT_BINARY_DIR} ${ocl_blob_file} -o ${pch_object} + COMMAND ${LLVM_INSTALL_DIR}clang ${clang_cmd} -emit-pch ${ocl_blob_file} -o ${local_pch_object} DEPENDS ${ocl_blob_file} ) @@ -71,14 +71,14 @@ macro(ll_add_library ll_lib ll_sources) add_custom_command( OUTPUT ${ll}.bc COMMAND rm -f ${ll}.bc - COMMAND ${CMAKE_BINARY_PATH}llvm-as -o ${ll}.bc ${GBE_SOURCE_DIR}/src/${ll} + COMMAND ${LLVM_INSTALL_DIR}llvm-as -o ${ll}.bc ${GBE_SOURCE_DIR}/src/${ll} DEPENDS ${ll} ) set (ll_objects ${ll_objects} ${ll}.bc) endforeach (ll ${ll_sources}) add_custom_command( OUTPUT ${ll_lib} - COMMAND ${CMAKE_BINARY_PATH}llvm-link -o ${ll_lib} ${ll_objects} + COMMAND ${LLVM_INSTALL_DIR}llvm-link -o ${ll_lib} ${ll_objects} DEPENDS ${ll_objects} ) add_custom_target(${ll_lib} -- 1.8.3.2 _______________________________________________ Beignet mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/beignet
