Merge pull request #97630 from treed/zhf-rpm-darwin

rpm: add openmp when building with clang
gstqt5
Robert Scott 2020-09-10 20:38:23 +01:00 committed by GitHub
commit 140b8718fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, lib
, pkgconfig, autoreconfHook
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua
, fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages
}:
stdenv.mkDerivation rec {
@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ];
buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua ]
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
# rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements
propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ]