diff options
| author | Christopher Baines <[email protected]> | 2024-03-16 10:19:30 +0000 |
|---|---|---|
| committer | Christopher Baines <[email protected]> | 2024-03-16 10:19:30 +0000 |
| commit | 618cae45dc2a45079e910e72be2062c58590f262 (patch) | |
| tree | 45536e51dafe3d34bd2cf55ee252e3345bf08803 /gnu/packages/cpp.scm | |
| parent | 2ee54513196bad8e663e78ac695b6ffa0da49051 (diff) | |
| parent | 00bf07ecccee86da4ced281bd28948c96db284e6 (diff) | |
Merge remote-tracking branch 'savannah/master' into gnome-team
Change-Id: I775274c2693536e2efa36c9abca4c54c5c458e26
Diffstat (limited to 'gnu/packages/cpp.scm')
| -rw-r--r-- | gnu/packages/cpp.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3b65ce9f4a..d451eea2fd 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2022 Attila Lendvai <[email protected]> ;;; Copyright © 2022 Arun Isaac <[email protected]> ;;; Copyright © 2022, 2023, 2024 David Elsing <[email protected]> -;;; Copyright © 2022, 2023 Zheng Junjie <[email protected]> +;;; Copyright © 2022-2024 Zheng Junjie <[email protected]> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <[email protected]> ;;; Copyright © 2022 Antero Mejr <[email protected]> ;;; Copyright © 2023 Sughosha <[email protected]> @@ -907,9 +907,12 @@ lock-free fixed size queue written in C++11.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - ;; The tests are flaky when run in parallel. For more info: - ;; https://bugs.gnu.org/46562 - '(#:parallel-tests? #f)) + ;; The tests are flaky when run in parallel. For more info: + ;; https://bugs.gnu.org/46562 + `(#:parallel-tests? #f + ,@(if (target-riscv64?) + `(#:make-flags (list "LDFLAGS=-latomic")) + '()))) (native-inputs (list autoconf automake libtool ;; For tests. |