diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-21 19:42:12 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-21 19:42:12 +0400 |
| commit | 7503bd59e141f4f4b1d9467c13263d0768a6b536 (patch) | |
| tree | a64185e861b43b3f8e53e95f1323cbe7a7f61d7f /build_files/build_environment | |
| parent | 6094011c902742889815b677f023ad870d661253 (diff) | |
Fix two stupid mistakes... Btw, osl now compiles with Fedora17, once llvm-3.1 has been compiled! ;)
Diffstat (limited to 'build_files/build_environment')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 15baa6df41c..935f37b53da 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -617,7 +617,7 @@ compile_OSL() { cd $_src # XXX For now, always update from latest repo... - git checkout . + git pull origin # Always refresh the whole build! if [ -d build ]; then @@ -1347,8 +1347,8 @@ print_info() { INFO " -D WITH_CYCLES_OSL=ON" INFO " -D LLVM_VERSION=$LLVM_VERSION_FOUND" if [ -d $INST/llvm ]; then - cmake_d="$cmake_d -D LLVM_DIRECTORY=$INST/llvm" - cmake_d="$cmake_d -D LLVM_STATIC=ON" + INFO " -D LLVM_DIRECTORY=$INST/llvm" + INFO " -D LLVM_STATIC=ON" fi fi |