From 580fe9f5f88079c8ba32f32d5b6404d3fd47133c Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 20 Oct 2020 12:47:46 +0200 Subject: Fix (unreported) install_deps: wrong version number for llvm in some cases. Version reported by package manager is not always satisfying (on Debian testing currently e.g. `llvm-dev` is reported as `9.0`, when exact one is actually `9.0.1`, this break CMake build of Blender then). Just use version reported by `llvm-config` instead, when using distribution packages. --- build_files/build_environment/install_deps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build_files/build_environment/install_deps.sh') diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index a9290438873..c2114eba53a 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -3958,7 +3958,7 @@ install_DEB() { if [ $? -eq 0 ]; then install_packages_DEB llvm-dev clang have_llvm=true - LLVM_VERSION=`get_package_version_DEB llvm-dev` + LLVM_VERSION=`llvm-config --version` LLVM_VERSION_FOUND=$LLVM_VERSION clean_LLVM else @@ -4607,7 +4607,7 @@ install_RPM() { if [ $? -eq 0 ]; then install_packages_RPM llvm-devel $CLANG_DEV have_llvm=true - LLVM_VERSION=`get_package_version_RPM llvm-devel` + LLVM_VERSION=`llvm-config --version` LLVM_VERSION_FOUND=$LLVM_VERSION clean_LLVM else @@ -5129,7 +5129,7 @@ install_ARCH() { if [ $? -eq 0 ]; then install_packages_ARCH llvm clang have_llvm=true - LLVM_VERSION=`get_package_version_ARCH llvm` + LLVM_VERSION=`llvm-config --version` LLVM_VERSION_FOUND=$LLVM_VERSION clean_LLVM else -- cgit v1.2.3