Commit 41eea142 authored by Jon Hermansen's avatar Jon Hermansen
Browse files

libffi: link tsan tests with pthread library on FreeBSD

parent 30349611

pkgs/development/libraries/libffi/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: { 
  # cgit) that are needed here should be included directly in Nixpkgs as

  # files.

  patches = [

    # Threading tests need to be linked against pthread

    # See: https://github.com/libffi/libffi/pull/944

    ./freebsd-tsan-pthread.patch

  ];



  strictDeps = true;

pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
From e52a0790a9b80492cba2907c27d0a9e4248b6608 Mon Sep 17 00:00:00 2001

From: Jon Hermansen <jon@jh86.org>

Date: Tue, 28 Oct 2025 18:02:39 -0400

Subject: [PATCH] fix tsan tests on FreeBSD by linking to pthread



---

 testsuite/lib/libffi.exp | 4 ++++

 1 file changed, 4 insertions(+)



diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp

index 81eff7752..308db6f8d 100644

--- a/testsuite/lib/libffi.exp

+++ b/testsuite/lib/libffi.exp

@@ -407,6 +407,10 @@ proc libffi_target_compile { source dest type options } {

             lappend options "libs= -lpthread"

         }

 

+        if { [string match "*-*-freebsd*" $target_triplet] } {

+            lappend options "libs= -lpthread"

+        }

+

         lappend options "libs= -lffi"

 

         if { [string match "aarch64*-*-linux*" $target_triplet] } {