Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-07-04 16:04:51 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-07-04 16:04:51 +0400
commit85c4feab027238bb9dbf7fa727cb608052ec79d5 (patch)
tree59b81ac2d5ef2b5f13c81067c4be93e59c6c911c /build_files
parent6ff6883f99d2faeb71359b9e2333a684e0ccf5ca (diff)
Install_deps: Final (hopefully!) fix for dual clang/cfe name (*sigh*).
Patch by simonrepp (Simon Repp), thanks!
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index d13a1e71d62..d6817307162 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