diff options
| author | Marius Bakke <[email protected]> | 2022-06-27 19:23:48 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-06-27 19:23:48 +0200 |
| commit | 2a7648774f1bba5bb443c00b8ab1a2ab75b7416f (patch) | |
| tree | 3e081532d1d4f83706b62b499f655ea3ed836e5b /gnu/packages/llvm.scm | |
| parent | 43519035f954b3dc41ac50a9a877fd802b864fdb (diff) | |
| parent | 0bd1c4fbbc8a438876d6efa4feb275de461a2484 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/llvm.scm')
| -rw-r--r-- | gnu/packages/llvm.scm | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 32625385ff..6e12c3ebde 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -878,7 +878,22 @@ of programming tools as well as libraries with equivalent functionality.") (patches (search-patches "llvm-9-fix-bitcast-miscompilation.patch" "llvm-9-fix-scev-miscompilation.patch" - "llvm-9-fix-lpad-miscompilation.patch")))))) + "llvm-9-fix-lpad-miscompilation.patch")))) + (arguments + (if (target-riscv64?) + (substitute-keyword-arguments (package-arguments llvm-10) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-dsymutil-link + (lambda _ + (substitute* "tools/dsymutil/CMakeLists.txt" + (("endif\\(APPLE\\)") + (string-append + "endif(APPLE)\n\n" + "if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES \"riscv64\")\n" + " target_link_libraries(dsymutil PRIVATE atomic)\n" + "endif()")))))))) + (package-arguments llvm-10))))) (define-public clang-runtime-9 (clang-runtime-from-llvm |