Skip to content

Commit 5dd1001

Browse files
authored
Auto merge of #34553 - alexcrichton:fix-nightlies, r=brson
configure: Fix cross-compiling LLVM for realz Actually got it working this time, and it was again just a problem specifying the llvm-tblgen binary. We need to point it at the $CFG_BUILD target's tblgen and then we also needed to correct the path a bit.
2 parents 366de83 + 213f163 commit 5dd1001

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,9 +1681,10 @@ do
16811681
fi
16821682

16831683
if [ "$t" != "$CFG_BUILD" ]; then
1684+
# see http://llvm.org/docs/HowToCrossCompileLLVM.html
16841685
CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_CROSSCOMPILING=True"
16851686
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TARGET_ARCH=$arch"
1686-
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TABLEGEN=$LLVM_INST_DIR/bin/llvm-tablegen"
1687+
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_TABLEGEN=$CFG_BUILD_DIR/$CFG_BUILD/llvm/bin/llvm-tblgen"
16871688
CMAKE_ARGS="$CMAKE_ARGS -DLLVM_DEFAULT_TARGET_TRIPLE=$t"
16881689
fi
16891690

0 commit comments

Comments
 (0)