nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76887 from corngood/llvm-cross-fix

Browse Source 
llvm: use correct version of tablegen when cross compiling _8 and _9
This commit is contained in:
John Ericson 2020-01-03 13:25:39 -05:00 committed by GitHub
commit ebec1d12a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/llvm/8/llvm.nix
View File

@ -109,7 +109,7 @@ in stdenv.mkDerivation ({
"-DCAN_TARGET_i386=false" "-DCAN_TARGET_i386=false"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_CROSSCOMPILING=True" "-DCMAKE_CROSSCOMPILING=True"
"-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen" "-DLLVM_TABLEGEN=${buildPackages.llvm_8}/bin/llvm-tblgen"
]; ];
postBuild = '' postBuild = ''

2
pkgs/development/compilers/llvm/9/llvm.nix
View File

@ -126,7 +126,7 @@ in stdenv.mkDerivation (rec {
"-DCAN_TARGET_i386=false" "-DCAN_TARGET_i386=false"
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"-DCMAKE_CROSSCOMPILING=True" "-DCMAKE_CROSSCOMPILING=True"
"-DLLVM_TABLEGEN=${buildPackages.llvm_7}/bin/llvm-tblgen" "-DLLVM_TABLEGEN=${buildPackages.llvm_9}/bin/llvm-tblgen"
]; ];
postBuild = '' postBuild = ''