dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #315250 from ExpidusOS/fix/pkgsllvm/tbb

Browse Source 
tbb: fix version script with lld 17+
This commit is contained in:
tomberek 2024-06-14 20:23:53 -04:00 committed by GitHub
commit 741193b4ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/tbb/2020_3.nix
View File

@ -60,6 +60,9 @@ stdenv.mkDerivation rec {
else if stdenv.hostPlatform.isi686 then "arch=ia32"
else throw "Unsupported cross architecture"));
# Fix undefined reference errors with version script under LLVM.
NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version";
enableParallelBuilding = true;
installPhase = ''

3
pkgs/development/libraries/tbb/default.nix
View File

@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
# https://gcc.gnu.org/PR108854
lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ];
# Fix undefined reference errors with version script under LLVM.
NIX_LDFLAGS = lib.optionalString (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "--undefined-version";
# Disable failing test on musl
# test/conformance/conformance_resumable_tasks.cpp:37:24: error: ‘suspend’ is not a member of ‘tbb::v1::task’; did you mean ‘tbb::detail::r1::suspend’?
postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''