public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30918 from Mankarse/tbb-clang

Browse Source 
tbb: clang support
This commit is contained in:
Daiderd Jordan 2017-10-29 13:00:09 +01:00 committed by GitHub
commit d39b7ceaaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub, compiler ? if stdenv.cc.isClang then "clang" else null, stdver ? null }:
stdenv.mkDerivation rec { with stdenv.lib; stdenv.mkDerivation rec {
name = "tbb-${version}"; name = "tbb-${version}";
version = "2018_U1"; version = "2018_U1";
@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw"; sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
}; };
makeFlags = concatStringsSep " " (
optional (compiler != null) "compiler=${compiler}" ++
optional (stdver != null) "stdver=${stdver}"
);
installPhase = '' installPhase = ''
mkdir -p $out/{lib,share/doc} mkdir -p $out/{lib,share/doc}
cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/ cp "build/"*release*"/"*${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib/
@ -21,7 +26,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = {
description = "Intel Thread Building Blocks C++ Library"; description = "Intel Thread Building Blocks C++ Library";
homepage = "http://threadingbuildingblocks.org/"; homepage = "http://threadingbuildingblocks.org/";
license = licenses.asl20; license = licenses.asl20;