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

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
2 changed files with 2 additions and 2 deletions

View File

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

View File

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