[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52450] trunk/blender/build_files/ build_environment/install_deps.sh: Fix two stupid mistakes...

[Bastien Montagne]

Revision: 52450
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52450
Author:   mont29
Date:     2012-11-21 15:42:12 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Fix two stupid mistakes... Btw, osl now compiles with Fedora17, once llvm-3.1 has been compiled! ;)

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-21 15:14:19 UTC (rev 52449)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-21 15:42:12 UTC (rev 52450)
@@ -617,7 +617,7 @@
 
     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 @@
     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