diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:39:49 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 23:41:36 +0100 |
| commit | ff22d90308d404dede8319fa6e22502ea058d3aa (patch) | |
| tree | 4e1936c9ab6bd7c31fb207ed8a4918ac24332b1d /pkgs/development/compilers/llvm | |
| parent | 192f4171d8a9cb7f2e675b4b96f16770bcf2bd15 (diff) | |
| download | nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.tar nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.tar.gz nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.tar.bz2 nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.tar.lz nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.tar.xz nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.tar.zst nixlib-ff22d90308d404dede8319fa6e22502ea058d3aa.zip | |
mesa_noglu: fix build
LLVM’s `LLVM_TARGETS_TO_BUILD` build flag defauls to `all`, which contains `AMDGPU` among others. [1] Changes in llvm [2] switched to explicitly listing host and target platforms, excluding the AMDGPU target, which is required for Mesa to build. [1]: https://github.com/llvm-mirror/llvm/blob/db50b6fe399b8ad8caef80fd8ee77607fb051fa5/CMakeLists.txt#L286-L302 [2]: https://github.com/NixOS/nixpkgs/pull/52031
Diffstat (limited to 'pkgs/development/compilers/llvm')
| -rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/7/llvm.nix | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 328f95f11b34..54617a075734 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -13,7 +13,8 @@ , fetchpatch , debugVersion ? false , enableManpages ? false -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] +# Mesa requires AMDGPU target +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enableSharedLibraries ? true }: diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 2ef6b147214c..a852822cddc4 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -14,7 +14,8 @@ , debugVersion ? false , enableManpages ? false , enableSharedLibraries ? true -, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform ] +# Mesa requires AMDGPU target +, enableTargets ? [ stdenv.hostPlatform stdenv.targetPlatform "AMDGPU" ] , enablePFM ? !stdenv.isDarwin }: |