guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

91/142: gnu: tbb-2020: Use ld.gold to work around segfaults in check pha


From: guix-commits
Subject: 91/142: gnu: tbb-2020: Use ld.gold to work around segfaults in check phase.
Date: Mon, 10 Jan 2022 13:07:26 -0500 (EST)

apteryx pushed a commit to branch version-1.4.0
in repository guix.

commit c61e742854c4c81b25bf6c249dd748477a1ffed8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Dec 23 00:50:53 2021 -0500

    gnu: tbb-2020: Use ld.gold to work around segfaults in check phase.
    
    * gnu/packages/tbb.scm (tbb-2020)
    [configure-flags]: Use -fuse-ld=gold in CFLAGS.
    [native-inputs]: Add ld-gold-wrapper.
---
 gnu/packages/tbb.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tbb.scm b/gnu/packages/tbb.scm
index 427f281686..e5d8394f5f 100644
--- a/gnu/packages/tbb.scm
+++ b/gnu/packages/tbb.scm
@@ -89,7 +89,8 @@ tasks, synchronization primitives, atomic operations, and 
more.")
     (arguments
      `(#:test-target "test"
        #:make-flags (list (string-append "LDFLAGS=-Wl,-rpath="
-                                         (assoc-ref %outputs "out") "/lib"))
+                                         (assoc-ref %outputs "out") "/lib")
+                          "CFLAGS=-fuse-ld=gold")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'fail-on-test-errors
@@ -121,6 +122,13 @@ tasks, synchronization primitives, atomic operations, and 
more.")
                (copy-recursively "doc" doc)
                (copy-recursively "examples" examples)
                (copy-recursively "include" include)))))))
+    (native-inputs
+     ;; XXX: For some reason, since commit "gnu: binutils: Absorb
+     ;; binutils-next", the build of just this version of TBB crashes during
+     ;; tests.  Workaround it by linking the binaries with ld.gold.
+     (list (module-ref (resolve-interface
+                        '(gnu packages commencement))
+                       'ld-gold-wrapper)))
     (home-page "https://www.threadingbuildingblocks.org";)
     (synopsis "C++ library for parallel programming")
     (description



reply via email to

[Prev in Thread] Current Thread [Next in Thread]