Fix two stupid mistakes... Btw, osl now compiles with Fedora17, once llvm-3.1 has...
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 21 Nov 2012 15:42:12 +0000 (15:42 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 21 Nov 2012 15:42:12 +0000 (15:42 +0000)
build_files/build_environment/install_deps.sh

index 15baa6df41c0727b04a8bd2727727a02b70f7f4b..935f37b53dac3183e0d780698e793ce5383343f5 100755 (executable)
@@ -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