diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:57:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:57:59 +0300 |
| commit | 4a4c6da0f8aaf94dff8d219770404c46760cce15 (patch) | |
| tree | ca7213d9957a1ce0ee4811e0deadfde2e42e18e9 /build_files | |
| parent | 6e2f17ea02be5caa9eee8a68ccd558474030b29a (diff) | |
| parent | aa1b35bb60d1d559f00095ed895a0c1884193a39 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 3816ab1aa0f..9f293b9e9e3 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1769,7 +1769,7 @@ compile_LLVM() { cd $_src # XXX Ugly patching hack! - patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.patch" + patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.diff" cd $CWD @@ -1875,7 +1875,7 @@ compile_OSL() { git reset --hard # XXX Ugly patching hack! - patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.patch" + patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.diff" fi # Always refresh the whole build! |