diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2018-08-01 14:57:51 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-01 14:57:51 +0200 |
| commit | 34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac (patch) | |
| tree | 68f8ba045adbc21bb72cbfdd87e7387c404a9892 /pkgs/development/compilers/halide/nix.patch | |
| parent | be066d0b27f02a4ca4d38ebd03079555a08cc6bf (diff) | |
| download | nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.tar nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.tar.gz nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.tar.bz2 nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.tar.lz nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.tar.xz nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.tar.zst nixlib-34f6b0cc0ee7f6f3b0d9916fadab9c24fec09bac.zip | |
halide: init at 2018_02_15 (#44207)
Diffstat (limited to 'pkgs/development/compilers/halide/nix.patch')
| -rw-r--r-- | pkgs/development/compilers/halide/nix.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/pkgs/development/compilers/halide/nix.patch b/pkgs/development/compilers/halide/nix.patch new file mode 100644 index 000000000000..2ab1e31adeb4 --- /dev/null +++ b/pkgs/development/compilers/halide/nix.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40a685b7e..c452efd09 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,10 +49,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") + + set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}") + +-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS) +-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM) +-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG) +-file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-config${CMAKE_EXECUTABLE_SUFFIX}" LLVM_CONFIG) ++find_program(LLVM_AS llvm-as HINTS ${LLVM_TOOLS_BINARY_DIR}) ++find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR}) ++find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR}) ++find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR}) + + # LLVM doesn't appear to expose --system-libs via its CMake interface, + # so we must shell out to llvm-config to find this info +diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt +index 132c80e6a..36ce865f2 100644 +--- a/apps/linear_algebra/CMakeLists.txt ++++ b/apps/linear_algebra/CMakeLists.txt +@@ -26,7 +26,7 @@ if (CBLAS_FOUND) + # Atlas requires also linking against its provided libcblas for cblas symbols + set(ATLAS_EXTRA_LIBS cblas) # XXX fragile + set(OpenBLAS_EXTRA_LIBS) +- set(BLAS_VENDORS OpenBLAS ATLAS) ++ set(BLAS_VENDORS OpenBLAS) + + # TODO + # there are more vendors we could add here that support the cblas interface +@@ -41,6 +41,7 @@ if (CBLAS_FOUND) + message(STATUS " ${BLAS_VENDOR}: Missing") + else() + message(STATUS " ${BLAS_VENDOR}: Found") ++ set(BLAS_LIBRARIES "${BLAS_LIBRARIES}" CACHE FILEPATH "BLAS library to use") + list(APPEND BLAS_VENDORS ${NAME}) + endif() + endforeach() +diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt +index 4b95eb3bb..1daa97437 100644 +--- a/apps/linear_algebra/tests/CMakeLists.txt ++++ b/apps/linear_algebra/tests/CMakeLists.txt +@@ -19,6 +19,6 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable) + target_link_libraries(test_halide_blas + PRIVATE + halide_blas +- cblas # XXX fragile ++ ${BLAS_LIBRARIES} + Halide + ) +-- +2.15.0 + |