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

2014-05-05 20:46:30 +02:00
parent 9a1c47de44
commit f5687323a3
1 changed files with 6 additions and 1 deletions
--- 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