efraim pushed a commit to branch master
in repository guix.

commit aaf8891ed4f4e0cc792a711919bf63e996c5a4d4
Author: Efraim Flashner <[email protected]>
AuthorDate: Wed Jun 7 18:39:34 2023 +0300

    gnu: tbb: Fix building on riscv64-linux.
    
    * gnu/packages/tbb.scm (tbb)[arguments]: When building for riscv64-linux
    always link the test suite with -latomic.
---
 gnu/packages/tbb.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index f22282264c..b2d276ac8b 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016 Nikita <[email protected]>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <[email protected]>
 ;;; Copyright © 2021 Guillaume Le Vaillant <[email protected]>
-;;; Copyright © 2022 Efraim Flashner <[email protected]>
+;;; Copyright © 2022, 2023 Efraim Flashner <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,7 +48,11 @@
               (patches (search-patches "tbb-other-arches.patch"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-DTBB_STRICT=OFF"))) ;; Don't fail on warnings
+     `(#:configure-flags
+       '(,@(if (target-riscv64?)
+            '("-DTBB_TEST_LINK_FLAGS=-latomic")
+            `())
+         "-DTBB_STRICT=OFF"))) ;; Don't fail on warnings
     (home-page "https://www.threadingbuildingblocks.org";)
     (synopsis "C++ library for parallel programming")
     (description

Reply via email to