From d9a6f3eba7e212aaa2283234ddf4edf918635fce Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 6 Feb 2018 20:52:29 -0700
Subject: [PATCH] Use llvm-tblgen-4.0 to fix build on newer Ubuntu
---
recipes/rust/recipe.sh | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/recipes/rust/recipe.sh b/recipes/rust/recipe.sh
index e59d7b510..28597ed1a 100644
--- a/recipes/rust/recipe.sh
+++ b/recipes/rust/recipe.sh
@@ -10,7 +10,32 @@ SYSROOT="/usr/$HOST"
unset AR AS CC CXX LD NM OBJCOPY OBJDUMP RANLIB READELF STRIP
-LLVM_CMAKE_ARGS=(-Wno-dev -DCMAKE_CROSSCOMPILING=True -DCMAKE_INSTALL_PREFIX="$LLVM_PREFIX" -DLLVM_DEFAULT_TARGET_TRIPLE=$HOST -DLLVM_TARGET_ARCH=$ARCH -DLLVM_TARGETS_TO_BUILD=X86 -DCMAKE_SYSTEM_NAME=Generic -DPYTHON_EXECUTABLE=/usr/bin/python2 -DUNIX=1 -DLLVM_ENABLE_THREADS=Off -DLLVM_INCLUDE_TESTS=OFF -target=$HOST -DLLVM_TABLEGEN=/usr/bin/llvm-tblgen -I"$SYSROOT/include" -DCMAKE_CXX_FLAGS='--std=gnu++11' -DLLVM_TOOL_LTO_BUILD=Off -DLLVM_TOOL_LLVM_PROFDATA_BUILD=Off -DLLVM_TOOL_LLI_BUILD=Off -DLLVM_TOOL_RDOBJ_BUILD=Off -DLLVM_TOOL_LLVM_COV_BUILD=Off -DLLVM_TOOL_LLVM_XRAY_BUILD=Off -DLLVM_TOOL_LLVM_LTO2_BUILD=Off -DLLVM_TOOL_LLVM_LTO_BUILD=Off -DLLVM_TOOL_LLVM_RTDYLD_BUILD=Off)
+LLVM_CMAKE_ARGS=(
+ -Wno-dev
+ -DCMAKE_CROSSCOMPILING=True
+ -DCMAKE_INSTALL_PREFIX="$LLVM_PREFIX"
+ -DLLVM_DEFAULT_TARGET_TRIPLE="$HOST"
+ -DLLVM_TARGET_ARCH="$ARCH"
+ -DLLVM_TARGETS_TO_BUILD=X86
+ -DCMAKE_SYSTEM_NAME=Generic
+ -DPYTHON_EXECUTABLE="/usr/bin/python2"
+ -DUNIX=1
+ -DLLVM_ENABLE_THREADS=Off
+ -DLLVM_INCLUDE_TESTS=Off
+ -target="$HOST"
+ -DLLVM_TABLEGEN="/usr/bin/llvm-tblgen-4.0"
+ -I"$SYSROOT/include"
+ -DCMAKE_CXX_FLAGS='--std=gnu++11'
+ -DLLVM_TOOL_LTO_BUILD=Off
+ -DLLVM_TOOL_LLVM_PROFDATA_BUILD=Off
+ -DLLVM_TOOL_LLI_BUILD=Off
+ -DLLVM_TOOL_RDOBJ_BUILD=Off
+ -DLLVM_TOOL_LLVM_COV_BUILD=Off
+ -DLLVM_TOOL_LLVM_XRAY_BUILD=Off
+ -DLLVM_TOOL_LLVM_LTO2_BUILD=Off
+ -DLLVM_TOOL_LLVM_LTO_BUILD=Off
+ -DLLVM_TOOL_LLVM_RTDYLD_BUILD=Off
+)
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
--
GitLab