diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch new file mode 100644 index 000000000000..bcdad510e10d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/beignet/clang_llvm.patch @@ -0,0 +1,49 @@ +diff --git a/./CMake/FindLLVM.cmake b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake +index a148321..96cafb8 100644 +--- a/./CMake/FindLLVM.cmake ++++ b/../Beignet-1.1.2-Source_new/CMake/FindLLVM.cmake +@@ -22,6 +22,7 @@ if (LLVM_CONFIG_EXECUTABLE) + else (LLVM_CONFIG_EXECUTABLE) + message(FATAL_ERROR "Could NOT find LLVM executable, please add -DLLVM_INSTALL_DIR=/path/to/llvm-config/ in cmake command") + endif (LLVM_CONFIG_EXECUTABLE) ++ + execute_process( + COMMAND ${LLVM_CONFIG_EXECUTABLE} --version + OUTPUT_VARIABLE LLVM_VERSION +@@ -44,10 +45,16 @@ if (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR) + endif (LLVM_VERSION_NODOT VERSION_LESS LLVM_FIND_VERSION_NODOT) + endif (LLVM_FIND_VERSION_MAJOR AND LLVM_FIND_VERSION_MINOR) + +-if (LLVM_INSTALL_DIR) ++if (CLANG_INSTALL_DIR) + find_program(CLANG_EXECUTABLE + NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang +- PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) ++ PATHS ${CLANG_INSTALL_DIR} NO_DEFAULT_PATH) ++else (CLANG_INSTALL_DIR) ++ find_program(CLANG_EXECUTABLE ++ NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) ++endif (CLANG_INSTALL_DIR) ++ ++if (LLVM_INSTALL_DIR) + find_program(LLVM_AS_EXECUTABLE + NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as + PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) +@@ -55,8 +62,6 @@ if (LLVM_INSTALL_DIR) + NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link + PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH) + else (LLVM_INSTALL_DIR) +- find_program(CLANG_EXECUTABLE +- NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang) + find_program(LLVM_AS_EXECUTABLE + NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as) + find_program(LLVM_LINK_EXECUTABLE +@@ -105,7 +110,7 @@ endif (LLVM_VERSION_NODOT VERSION_GREATER 34) + macro(add_one_lib name) + FIND_LIBRARY(CLANG_LIB + NAMES ${name} +- PATHS ${LLVM_LIBRARY_DIR} NO_DEFAULT_PATH) ++ PATHS ${CLANG_LIBRARY_DIR} NO_DEFAULT_PATH) + set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_LIB}) + unset(CLANG_LIB CACHE) + endmacro() |