[Bf-blender-cvs] [f568732] master: Install_deps: explicitely disable OSL/LLVM seems needed...

[Bastien Montagne]

Commit: f5687323a362847a2f8d101da8512f06e3c1f5f3
Author: Bastien Montagne
Date:   Mon May 5 20:46:30 2014 +0200
https://developer.blender.org/rBf5687323a362847a2f8d101da8512f06e3c1f5f3

Install_deps: explicitely disable OSL/LLVM seems needed...

===================================================================

M	build_files/build_environment/install_deps.sh

===================================================================

diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index b2290a4..4fa7946 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2943,7 +2943,6 @@ print_info() {
     _buildargs="$_buildargs $_1"
   fi
 
-  PRINT "$OSL_SKIP"
   if [ "$OSL_SKIP" = false ]; then
     _1="-D WITH_CYCLES_OSL=ON"
     _2="-D WITH_LLVM=ON"
@@ -2964,6 +2963,12 @@ print_info() {
       PRINT "  $_2"
       _buildargs="$_buildargs $_1 $_2"
     fi
+  else
+    _1="-D WITH_CYCLES_OSL=OFF"
+    _2="-D WITH_LLVM=OFF"
+    PRINT "  $_1"
+    PRINT "  $_2"
+    _buildargs="$_buildargs $_1 $_2"
   fi
 
   if $WITH_OPENCOLLADA; then