kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix T47939: Install Deps OSL 1.7.1 and clang-3.5

Browse Source 
Until we officially support llvm3.5 or more, only allow for 3.4 llvm packages,
and build own stuff otherwise...
This commit is contained in:
Bastien Montagne 2016-03-26 00:31:41 +01:00
parent 2bd3acf7cd
commit eac770a33a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build_files/build_environment/install_deps.sh
View File

@ -2649,15 +2649,15 @@ install_DEB() {
LLVM_VERSION_FOUND=$LLVM_VERSION LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM clean_LLVM
else else
check_package_version_ge_DEB llvm-dev $LLVM_VERSION_MIN #~ check_package_version_ge_DEB llvm-dev $LLVM_VERSION_MIN
if [ $? -eq 0 ]; then #~ if [ $? -eq 0 ]; then
install_packages_DEB llvm-dev clang #~ install_packages_DEB llvm-dev clang
have_llvm=true #~ have_llvm=true
LLVM_VERSION_FOUND="" # Using default one, no need to specify it! #~ LLVM_VERSION_FOUND="" # Using default one, no need to specify it!
clean_LLVM #~ clean_LLVM
else #~ else
_do_compile_llvm=true _do_compile_llvm=true
fi #~ fi
fi fi
fi fi
@ -3563,7 +3563,7 @@ install_ARCH() {
INFO "Forced LLVM building, as requested..." INFO "Forced LLVM building, as requested..."
_do_compile_llvm=true _do_compile_llvm=true
else else
check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN check_package_version_match_ARCH llvm $LLVM_VERSION
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang install_packages_ARCH llvm clang
have_llvm=true have_llvm=true