Commit: 85c4feab027238bb9dbf7fa727cb608052ec79d5
Author: Bastien Montagne
Date: Fri Jul 4 14:04:51 2014 +0200
https://developer.blender.org/rB85c4feab027238bb9dbf7fa727cb608052ec79d5
Install_deps: Final (hopefully!) fix for dual clang/cfe name (*sigh*).
Patch by simonrepp (Simon Repp), thanks!
===================================================================
M 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 d13a1e7..d681730 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1320,8 +1320,9 @@ compile_LLVM() {
tar -C $SRC --transform
"s,([^/]*/?)llvm-[^/]*(.*),\1LLVM-$LLVM_VERSION\2,x" \
-xf $_src.tar.gz
INFO "Unpacking CLANG-$LLVM_VERSION to $_src/tools/clang"
+ # Stupid clang guys renamed 'clang' to 'cfe' for now handle both
cases... :(
tar -C $_src/tools \
- --transform "s,([^/]*/?)clang-[^/]*(.*),\1clang\2,x" \
+ --transform "s,([^/]*/?)(clang|cfe)-[^/]*(.*),\1clang\3,x" \
-xf $_src_clang.tar.gz
cd $_src
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
