From e11830d36e557dd7ab48733c679267f238db597b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Sep 2021 11:58:47 +0200 Subject: gnu: llvm-for-rocm: Move to llvm.scm. This removes a cross-module top-level reference, which could lead to build errors when importing (gnu packages rocm) in another module. * gnu/packages/rocm.scm (llvm-for-rocm): Move to... * gnu/packages/llvm.scm (llvm-for-rocm): ... here. --- gnu/packages/rocm.scm | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'gnu/packages/rocm.scm') diff --git a/gnu/packages/rocm.scm b/gnu/packages/rocm.scm index 05dbb00be4..9a015d2490 100644 --- a/gnu/packages/rocm.scm +++ b/gnu/packages/rocm.scm @@ -1,4 +1,4 @@ -;;; +;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Lars-Dominik Braun ;;; ;;; This program is free software; you can redistribute it and/or modify it @@ -56,41 +56,6 @@ (define-public rocm-cmake tasks needed for the ROCM software stack.") (license license:ncsa))) -(define-public llvm-for-rocm - (hidden-package - (package - ;; Actually based on LLVM 13 as of v4.3, but llvm-12 works just fine. - (inherit llvm-12) - (name "llvm-for-rocm") - (version %rocm-version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/RadeonOpenCompute/llvm-project.git") - (commit (string-append "rocm-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0p75nr1qpmy6crymdax5hm40wkimman4lnglz4x5cnbiqindya7s")) - (patches - (search-patches "llvm-roc-4.2.0-add_Object.patch" - "llvm-roc-3.0.0-add_libraries.patch" - "llvm-roc-4.0.0-remove-isystem-usr-include.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments llvm-12) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'chdir - (lambda _ - (chdir "llvm"))))) - ((#:configure-flags flags) - ''("-DLLVM_ENABLE_PROJECTS=llvm;clang;lld" - "-DLLVM_TARGETS_TO_BUILD=AMDGPU;X86" - "-DCMAKE_SKIP_BUILD_RPATH=FALSE" - "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE" - "-DBUILD_SHARED_LIBS:BOOL=TRUE" - "-DLLVM_VERSION_SUFFIX="))))))) - (define-public rocm-device-libs (package (name "rocm-device-libs") -- cgit v1.2.3