Browse Source

rbx fix and added bash_functions to prereq

Nate 9 years ago
parent
commit
4f74495c0e

+ 3 - 0
toolset/setup/linux/languages/rbx-2.4.sh

@@ -12,6 +12,9 @@ RETCODE=$(fw_exists ${IROOT}/rbx-2.4.installed)
 # update this when it changes
 RBX_VERSION=2.4.1
 
+# This version of RBX needs clang 3.4
+sudo apt-get -yq --force-yes install clang-3.4
+
 # We assume single-user installation as
 # done in our rvm.sh script and
 # in Travis-CI

+ 3 - 0
toolset/setup/linux/languages/rbx-2.5.sh

@@ -12,6 +12,9 @@ RETCODE=$(fw_exists ${IROOT}/rbx-2.5.installed)
 # update this when it changes
 RBX_VERSION=2.5.2
 
+# This version of RBX needs clang 3.4
+sudo apt-get -yq --force-yes install clang-3.4
+
 # We assume single-user installation as
 # done in our rvm.sh script and
 # in Travis-CI

+ 3 - 2
toolset/setup/linux/prerequisites.sh

@@ -3,11 +3,12 @@
 set -x
 export DEBIAN_FRONTEND=noninteractive
 
+source $FWROOT/toolset/setup/linux/bash_functions.sh
+
 RETCODE=$(fw_exists fwbm_prereqs_installed)
 [ ! "$RETCODE" == 0 ] || { \
   echo "Prerequisites installed!"; 
-  return 0; 
-}
+  return 0; }
 
 
 # Use a more recent version of Mongo shell