diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-27 05:22:31 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-27 05:22:31 +0100 |
| commit | 4c70f5242befb5786cb437559a4d8701e630bd29 (patch) | |
| tree | dbbff437004184d50c9a53f6c4897a85361aceb1 /gnu/packages/cpp.scm | |
| parent | a9e65e0341d5045e425e3cf8d741a3d13cfa35a1 (diff) | |
| parent | 929ddec8f4a181be653152c7436581c2adc54eee (diff) | |
Merge branch 'master' into emacs-team
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 <attila@lendvai.name> ;;; Copyright © 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2022, 2023, 2024 David Elsing <david.elsing@posteo.net> -;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2023 Sughosha <Sughosha@proton.me> @@ -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. |